diff --git a/build.gradle b/build.gradle index 51922beb8..714e1bc2c 100755 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' } } diff --git a/gradle.properties b/gradle.properties index f59116fac..5f5274207 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ -mcversion=1.9 -forgeversion=12.16.1.1907 -mcp_mappings=snapshot_20160515 +mcversion=1.9.4 +forgeversion=12.17.0.1922-1.9.4 +mcp_mappings=snapshot_20160525 -jei_version=3.3.3.+ +jei_version=3.4.0.+ version_major=5 version_minor=0 diff --git a/src/api/java/cofh/api/energy/TileEnergyHandler.java b/src/api/java/cofh/api/energy/TileEnergyHandler.java index 3ba60a664..6d2726c89 100644 --- a/src/api/java/cofh/api/energy/TileEnergyHandler.java +++ b/src/api/java/cofh/api/energy/TileEnergyHandler.java @@ -1,5 +1,7 @@ package cofh.api.energy; +import javax.annotation.Nonnull; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -23,11 +25,12 @@ public class TileEnergyHandler extends TileEntity implements IEnergyReceiver, IE storage.readFromNBT(nbt); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbt) { - - super.writeToNBT(nbt); + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + nbt = super.writeToNBT(nbt); storage.writeToNBT(nbt); + return nbt; } /* IEnergyConnection */ diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index 9f294559e..fc5acb8f4 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -49,7 +49,7 @@ import forestry.plugins.PluginManager; name = Constants.MOD_ID, version = Constants.VERSION, guiFactory = "forestry.core.config.ForestryGuiConfigFactory", - dependencies = "required-after:Forge@[12.16.1.1892,);" + dependencies = "required-after:Forge@[12.17.0.1922,);" + "after:Buildcraft|Core@[7.2,);" + "after:BuildCraft|Energy@[7.2,);" + "after:ExtrabiomesXL;" diff --git a/src/main/java/forestry/api/apiculture/IBee.java b/src/main/java/forestry/api/apiculture/IBee.java index 865859b2a..b6fff1b12 100644 --- a/src/main/java/forestry/api/apiculture/IBee.java +++ b/src/main/java/forestry/api/apiculture/IBee.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Set; import net.minecraft.item.ItemStack; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import forestry.api.arboriculture.ITree; import forestry.api.core.IErrorState; @@ -71,7 +71,7 @@ public interface IBee extends IIndividualLiving { */ Set getCanWork(IBeeHousing housing); - List getSuitableBiomes(); + List getSuitableBiomes(); ItemStack[] getProduceList(); diff --git a/src/main/java/forestry/api/apiculture/IBeeHousing.java b/src/main/java/forestry/api/apiculture/IBeeHousing.java index 4deb98b8e..833f3acbc 100644 --- a/src/main/java/forestry/api/apiculture/IBeeHousing.java +++ b/src/main/java/forestry/api/apiculture/IBeeHousing.java @@ -7,7 +7,7 @@ package forestry.api.apiculture; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import com.mojang.authlib.GameProfile; @@ -47,7 +47,7 @@ public interface IBeeHousing extends IHousing, IErrorLogicSource { /** Must not be named "getWorld" to avoid SpecialSource issue https://github.com/md-5/SpecialSource/issues/12 */ World getWorldObj(); - BiomeGenBase getBiome(); + Biome getBiome(); GameProfile getOwner(); diff --git a/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java b/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java index 1408dc836..faea9feaf 100644 --- a/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java +++ b/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java @@ -9,6 +9,7 @@ import javax.annotation.Nonnull; import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import forestry.api.core.INbtReadable; @@ -39,7 +40,7 @@ public interface IBeekeepingLogic extends INbtWritable, INbtReadable { /** * Call this when the housing comes into view of the client. - * (i.e. when tile.getDescriptionPacket() is called) + * (i.e. when {@link TileEntity#getUpdateTag()} is called) */ void syncToClient(); diff --git a/src/main/java/forestry/api/apiculture/hives/IHiveDescription.java b/src/main/java/forestry/api/apiculture/hives/IHiveDescription.java index 36be4811c..5b7996c2d 100644 --- a/src/main/java/forestry/api/apiculture/hives/IHiveDescription.java +++ b/src/main/java/forestry/api/apiculture/hives/IHiveDescription.java @@ -8,7 +8,7 @@ package forestry.api.apiculture.hives; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -29,7 +29,7 @@ public interface IHiveDescription { * returns true if the hive can be generated in these conditions. * Used as a fast early-elimination check for hives that have no hope of spawning in the area. */ - boolean isGoodBiome(BiomeGenBase biome); + boolean isGoodBiome(Biome biome); boolean isGoodHumidity(EnumHumidity humidity); diff --git a/src/main/java/forestry/api/core/BiomeHelper.java b/src/main/java/forestry/api/core/BiomeHelper.java index 753ffa508..4fd11cc34 100644 --- a/src/main/java/forestry/api/core/BiomeHelper.java +++ b/src/main/java/forestry/api/core/BiomeHelper.java @@ -3,21 +3,21 @@ package forestry.api.core; import java.util.HashMap; import java.util.Map; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; public class BiomeHelper { - private static final Map isBiomeHellishCache = new HashMap<>(); + private static final Map isBiomeHellishCache = new HashMap<>(); /** - * Determines if a given BiomeGenBase is of HELLISH temperature, since it is treated separately from actual temperature values. + * Determines if a given Biome is of HELLISH temperature, since it is treated separately from actual temperature values. * Uses the BiomeDictionary. - * @param biomeGen BiomeGenBase of the biome in question - * @return true, if the BiomeGenBase is a Nether-type biome; false otherwise. + * @param biomeGen Biome of the biome in question + * @return true, if the Biome is a Nether-type biome; false otherwise. */ - public static boolean isBiomeHellish(BiomeGenBase biomeGen) { + public static boolean isBiomeHellish(Biome biomeGen) { if (isBiomeHellishCache.containsKey(biomeGen)) { return isBiomeHellishCache.get(biomeGen); } diff --git a/src/main/java/forestry/api/core/EnumHumidity.java b/src/main/java/forestry/api/core/EnumHumidity.java index ae7f39d1f..c234c6b62 100644 --- a/src/main/java/forestry/api/core/EnumHumidity.java +++ b/src/main/java/forestry/api/core/EnumHumidity.java @@ -5,13 +5,18 @@ ******************************************************************************/ package forestry.api.core; +import net.minecraft.world.biome.Biome; + /** * Many things Forestry use temperature and humidity of a biome to determine whether they can or how they can work or spawn at a given location. * * This enum concerns humidity. */ public enum EnumHumidity { - ARID("Arid"), NORMAL("Normal"), DAMP("Damp"); + ARID("Arid"), + NORMAL("Normal"), + /** matches {@link Biome#isHighHumidity()} */ + DAMP("Damp"); public final String name; @@ -25,12 +30,13 @@ public enum EnumHumidity { /** * Determines the EnumHumidity given a floating point representation of Minecraft Rainfall. - * To check if rainfall is possible in a biome, use BiomeHelper.canRainOrSnow(). + * To check if rainfall is possible in a biome, use {@link Biome#canRain()}. + * * @param rawHumidity raw rainfall value * @return EnumHumidity corresponding to rainfall value */ public static EnumHumidity getFromValue(float rawHumidity) { - if (rawHumidity > 0.85f) { // matches BiomeGenBase.isHighHumidity() + if (rawHumidity > 0.85f) { return DAMP; } else if (rawHumidity >= 0.3f) { return NORMAL; diff --git a/src/main/java/forestry/api/core/EnumTemperature.java b/src/main/java/forestry/api/core/EnumTemperature.java index 32f570b5d..756c70093 100644 --- a/src/main/java/forestry/api/core/EnumTemperature.java +++ b/src/main/java/forestry/api/core/EnumTemperature.java @@ -8,7 +8,7 @@ package forestry.api.core; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -60,15 +60,15 @@ public enum EnumTemperature { } } - public static EnumTemperature getFromBiome(BiomeGenBase biomeGenBase) { - if (BiomeHelper.isBiomeHellish(biomeGenBase)) { + public static EnumTemperature getFromBiome(Biome Biome) { + if (BiomeHelper.isBiomeHellish(Biome)) { return HELLISH; } - return getFromValue(biomeGenBase.getTemperature()); + return getFromValue(Biome.getTemperature()); } - public static EnumTemperature getFromBiome(BiomeGenBase biomeGenBase, World world, BlockPos pos) { - if (BiomeHelper.isBiomeHellish(biomeGenBase)) { + public static EnumTemperature getFromBiome(Biome Biome, World world, BlockPos pos) { + if (BiomeHelper.isBiomeHellish(Biome)) { return HELLISH; } float temperature = ForestryAPI.climateManager.getTemperature(world, pos); diff --git a/src/main/java/forestry/api/core/INbtWritable.java b/src/main/java/forestry/api/core/INbtWritable.java index fd8271f2f..0e4ff066f 100644 --- a/src/main/java/forestry/api/core/INbtWritable.java +++ b/src/main/java/forestry/api/core/INbtWritable.java @@ -8,5 +8,5 @@ package forestry.api.core; import net.minecraft.nbt.NBTTagCompound; public interface INbtWritable { - void writeToNBT(NBTTagCompound nbt); + NBTTagCompound writeToNBT(NBTTagCompound nbt); } diff --git a/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java b/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java index 965459cf7..346cdde99 100644 --- a/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java +++ b/src/main/java/forestry/api/greenhouse/DefaultGreenhouseLogic.java @@ -5,9 +5,10 @@ ******************************************************************************/ package forestry.api.greenhouse; -import forestry.api.multiblock.IGreenhouseController; import net.minecraft.nbt.NBTTagCompound; +import forestry.api.multiblock.IGreenhouseController; + public class DefaultGreenhouseLogic implements IGreenhouseLogic { public final IGreenhouseController controller; @@ -19,7 +20,8 @@ public class DefaultGreenhouseLogic implements IGreenhouseLogic { } @Override - public void writeToNBT(NBTTagCompound nbt) { + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + return nbt; } @Override diff --git a/src/main/java/forestry/api/multiblock/IMultiblockLogic.java b/src/main/java/forestry/api/multiblock/IMultiblockLogic.java index 9e14c2c0b..7a799a940 100644 --- a/src/main/java/forestry/api/multiblock/IMultiblockLogic.java +++ b/src/main/java/forestry/api/multiblock/IMultiblockLogic.java @@ -69,5 +69,5 @@ public interface IMultiblockLogic extends INbtWritable { * Use this in Tile.writeToNBT() */ @Override - void writeToNBT(NBTTagCompound nbttagcompound); + NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound); } diff --git a/src/main/java/forestry/api/multiblock/MultiblockTileEntityBase.java b/src/main/java/forestry/api/multiblock/MultiblockTileEntityBase.java index 646ce6c3c..baa2a15c3 100644 --- a/src/main/java/forestry/api/multiblock/MultiblockTileEntityBase.java +++ b/src/main/java/forestry/api/multiblock/MultiblockTileEntityBase.java @@ -5,9 +5,10 @@ ******************************************************************************/ package forestry.api.multiblock; +import javax.annotation.Nonnull; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -46,10 +47,12 @@ public abstract class MultiblockTileEntityBase exten multiblockLogic.readFromNBT(data); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound data) { - super.writeToNBT(data); + public NBTTagCompound writeToNBT(NBTTagCompound data) { + data = super.writeToNBT(data); multiblockLogic.writeToNBT(data); + return data; } @Override @@ -72,21 +75,36 @@ public abstract class MultiblockTileEntityBase exten /* Network Communication */ + @Nonnull @Override - public final Packet getDescriptionPacket() { - NBTTagCompound packetData = new NBTTagCompound(); - multiblockLogic.encodeDescriptionPacket(packetData); - this.encodeDescriptionPacket(packetData); - return new SPacketUpdateTileEntity(getPos(), 0, packetData); + public SPacketUpdateTileEntity getUpdatePacket() { + return new SPacketUpdateTileEntity(getPos(), 0, getUpdateTag()); } - + + @Nonnull + @Override + public NBTTagCompound getUpdateTag() { + NBTTagCompound updateTag = super.getUpdateTag(); + multiblockLogic.encodeDescriptionPacket(updateTag); + this.encodeDescriptionPacket(updateTag); + return updateTag; + } + @Override public final void onDataPacket(NetworkManager network, SPacketUpdateTileEntity packet) { + super.onDataPacket(network, packet); NBTTagCompound nbtData = packet.getNbtCompound(); multiblockLogic.decodeDescriptionPacket(nbtData); this.decodeDescriptionPacket(nbtData); } + @Override + public void handleUpdateTag(@Nonnull NBTTagCompound tag) { + super.handleUpdateTag(tag); + multiblockLogic.decodeDescriptionPacket(tag); + this.decodeDescriptionPacket(tag); + } + /** * Used to write tileEntity-specific data to the descriptionPacket */ diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 37752e2c4..7bfd93c33 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -103,7 +103,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("BreedingTime", beeProgress); nbttagcompound.setInteger("Throttle", queenWorkCycleThrottle); @@ -126,6 +126,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { nbttaglist.appendTag(nbttagcompound1); } nbttagcompound.setTag("Offspring", nbttaglist); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java b/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java index 261e88925..02f72a340 100644 --- a/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java @@ -74,7 +74,7 @@ public class FakeBeekeepingLogic implements IBeekeepingLogic { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + return nbttagcompound; } } diff --git a/src/main/java/forestry/apiculture/HasFlowersCache.java b/src/main/java/forestry/apiculture/HasFlowersCache.java index 630903d78..af7ac5915 100644 --- a/src/main/java/forestry/apiculture/HasFlowersCache.java +++ b/src/main/java/forestry/apiculture/HasFlowersCache.java @@ -136,7 +136,7 @@ public class HasFlowersCache implements INbtWritable, INbtReadable, IStreamable } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { NBTTagCompound hasFlowerCacheNBT = new NBTTagCompound(); if (!flowerCoords.isEmpty()) { @@ -155,6 +155,7 @@ public class HasFlowersCache implements INbtWritable, INbtReadable, IStreamable hasFlowerCacheNBT.setInteger(nbtKeyCooldown, cooldown); nbttagcompound.setTag(nbtKey, hasFlowerCacheNBT); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index a3af100d1..13342f360 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -30,7 +30,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.storage.loot.LootTableList; @@ -107,7 +107,7 @@ import forestry.core.PluginFluids; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; -import forestry.core.entities.EntityFXSnow; +import forestry.core.entities.ParticleSnow; import forestry.core.fluids.Fluids; import forestry.core.items.EnumElectronTube; import forestry.core.network.IPacketRegistry; @@ -937,9 +937,9 @@ public class PluginApiculture extends BlankForestryPlugin { @SubscribeEvent @SideOnly(Side.CLIENT) public void textureHook(TextureStitchEvent.Pre event) { - EntityFXSnow.sprites = new TextureAtlasSprite[3]; - for (int i = 0; i < EntityFXSnow.sprites.length; i++) { - EntityFXSnow.sprites[i] = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/snow." + (i + 1))); + ParticleSnow.sprites = new TextureAtlasSprite[3]; + for (int i = 0; i < ParticleSnow.sprites.length; i++) { + ParticleSnow.sprites[i] = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/snow." + (i + 1))); } ParticleBee.beeSprite = event.getMap().registerSprite(new ResourceLocation("forestry:entity/particles/swarm_bee")); } @@ -947,7 +947,7 @@ public class PluginApiculture extends BlankForestryPlugin { private static class EndFlowerAcceptableRule implements IFlowerAcceptableRule { @Override public boolean isAcceptableFlower(String flowerType, World world, BlockPos pos) { - BiomeGenBase biomeGenForCoords = world.getBiomeGenForCoords(pos); + Biome biomeGenForCoords = world.getBiome(pos); return BiomeDictionary.isBiomeOfType(biomeGenForCoords, BiomeDictionary.Type.END); } } diff --git a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java index 47eb20e8a..8d62c9476 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java @@ -249,10 +249,8 @@ public abstract class BlockAlveary extends BlockStructure implements IStateMappe } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) { - super.onNeighborBlockChange(world, pos, state, neighborBlock); - - TileEntity tileEntity = world.getTileEntity(pos); + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { + TileEntity tileEntity = worldIn.getTileEntity(pos); if (tileEntity instanceof TileAlveary) { TileAlveary tileAlveary = (TileAlveary) tileEntity; @@ -260,7 +258,7 @@ public abstract class BlockAlveary extends BlockStructure implements IStateMappe IAlvearyControllerInternal alveary = tileAlveary.getMultiblockLogic().getController(); alveary.reassemble(); if(alveary.getReferenceCoord() != null){ - Proxies.net.sendNetworkPacket(new PacketAlveryChange(alveary), world); + Proxies.net.sendNetworkPacket(new PacketAlveryChange(alveary), worldIn); } } } diff --git a/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java index 153ce7c6a..c513dbf9c 100644 --- a/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java +++ b/src/main/java/forestry/apiculture/entities/AIAvoidPlayers.java @@ -14,7 +14,7 @@ import net.minecraft.entity.EntityCreature; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.RandomPositionGenerator; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.pathfinding.PathEntity; +import net.minecraft.pathfinding.Path; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.util.math.Vec3d; @@ -26,7 +26,7 @@ public class AIAvoidPlayers extends EntityAIBase { private final float nearSpeed; private final float minDistance; - private PathEntity pathing; + private Path path; private final PathNavigate pathNavigator; @@ -65,8 +65,8 @@ public class AIAvoidPlayers extends EntityAIBase { return false; } - pathing = pathNavigator.getPathToXYZ(randomTarget.xCoord, randomTarget.yCoord, randomTarget.zCoord); - return pathing != null && pathing.isDestinationSame(randomTarget); + path = pathNavigator.getPathToXYZ(randomTarget.xCoord, randomTarget.yCoord, randomTarget.zCoord); + return path != null && path.isDestinationSame(randomTarget); } @Override @@ -76,7 +76,7 @@ public class AIAvoidPlayers extends EntityAIBase { @Override public void startExecuting() { - this.pathNavigator.setPath(pathing, farSpeed); + this.pathNavigator.setPath(path, farSpeed); } @Override diff --git a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java index 6dbe49230..903dd6d7e 100644 --- a/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/entities/EntityMinecartBeeHousingBase.java @@ -17,7 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import com.mojang.authlib.GameProfile; @@ -105,8 +105,8 @@ public abstract class EntityMinecartBeeHousingBase extends EntityMinecartContain } @Override - public BiomeGenBase getBiome() { - return worldObj.getBiomeGenForCoords(getPosition()); + public Biome getBiome() { + return worldObj.getBiome(getPosition()); } @Override diff --git a/src/main/java/forestry/apiculture/entities/ParticleBee.java b/src/main/java/forestry/apiculture/entities/ParticleBee.java index f0d4b25f1..a2707d0f7 100644 --- a/src/main/java/forestry/apiculture/entities/ParticleBee.java +++ b/src/main/java/forestry/apiculture/entities/ParticleBee.java @@ -10,14 +10,14 @@ ******************************************************************************/ package forestry.apiculture.entities; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class ParticleBee extends EntityFX { +public class ParticleBee extends Particle { private final double originX; private final double originY; private final double originZ; diff --git a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java index 9d5cc33a4..192369da1 100755 --- a/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java +++ b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.apiculture.genetics; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -33,7 +35,7 @@ public class ApiaristTracker extends BreedingTracker implements IApiaristTracker private int princessesTotal = 0; @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { + public void readFromNBT(@Nonnull NBTTagCompound nbttagcompound) { queensTotal = nbttagcompound.getInteger("QueensTotal"); princessesTotal = nbttagcompound.getInteger("PrincessesTotal"); @@ -43,15 +45,16 @@ public class ApiaristTracker extends BreedingTracker implements IApiaristTracker } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("QueensTotal", queensTotal); nbttagcompound.setInteger("PrincessesTotal", princessesTotal); nbttagcompound.setInteger("DronesTotal", dronesTotal); - super.writeToNBT(nbttagcompound); - + nbttagcompound = super.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index c1d6d57eb..58a9f014f 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -27,7 +27,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3i; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import com.mojang.authlib.GameProfile; @@ -120,9 +120,9 @@ public class Bee extends IndividualLiving implements IBee { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + nbttagcompound = super.writeToNBT(nbttagcompound); if (!isNatural) { nbttagcompound.setBoolean("NA", false); @@ -131,6 +131,7 @@ public class Bee extends IndividualLiving implements IBee { if (generation > 0) { nbttagcompound.setInteger("GEN", generation); } + return nbttagcompound; } @Override @@ -247,7 +248,7 @@ public class Bee extends IndividualLiving implements IBee { @Override public Set getCanWork(IBeeHousing housing) { World world = housing.getWorldObj(); - BiomeGenBase biome = housing.getBiome(); + Biome biome = housing.getBiome(); BlockPos housingCoords = housing.getCoordinates(); Set errorStates = new HashSet<>(); @@ -336,7 +337,7 @@ public class Bee extends IndividualLiving implements IBee { return genome.getToleratesRain() || beeModifier.isSealed(); } - private boolean isSuitableBiome(BiomeGenBase biome) { + private boolean isSuitableBiome(Biome biome) { if (biome == null) { return false; } @@ -353,9 +354,9 @@ public class Bee extends IndividualLiving implements IBee { } @Override - public ArrayList getSuitableBiomes() { - ArrayList suitableBiomes = new ArrayList<>(); - for (BiomeGenBase biome : BiomeGenBase.REGISTRY) { + public ArrayList getSuitableBiomes() { + ArrayList suitableBiomes = new ArrayList<>(); + for (Biome biome : Biome.REGISTRY) { if (isSuitableBiome(biome)) { suitableBiomes.add(biome); } diff --git a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java index 03058ff00..a4cf424eb 100755 --- a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java +++ b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java @@ -22,7 +22,7 @@ import java.util.Set; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; @@ -89,7 +89,7 @@ public class GuiHabitatLocator extends GuiForestry activeBiomeTypes = EnumSet.noneOf(BiomeDictionary.Type.class); - for (BiomeGenBase biome : inventory.getBiomesToSearch()) { + for (Biome biome : inventory.getBiomesToSearch()) { Collections.addAll(activeBiomeTypes, BiomeDictionary.getTypesForBiome(biome)); } diff --git a/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java b/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java index 8c847ba9a..088404338 100644 --- a/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java +++ b/src/main/java/forestry/apiculture/inventory/ItemInventoryHabitatLocator.java @@ -18,7 +18,7 @@ import java.util.Set; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBee; @@ -85,7 +85,7 @@ public class ItemInventoryHabitatLocator extends ItemInventory implements IError locatorLogic.startBiomeSearch(bee, player); } - public Set getBiomesToSearch() { + public Set getBiomesToSearch() { return locatorLogic.getTargetBiomes(); } diff --git a/src/main/java/forestry/apiculture/items/HabitatLocatorLogic.java b/src/main/java/forestry/apiculture/items/HabitatLocatorLogic.java index 7028e1898..61e754ce4 100644 --- a/src/main/java/forestry/apiculture/items/HabitatLocatorLogic.java +++ b/src/main/java/forestry/apiculture/items/HabitatLocatorLogic.java @@ -20,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; @@ -34,9 +34,9 @@ public class HabitatLocatorLogic { private static final int spacing = 20; private static final int minBiomeRadius = 8; - private static final Set waterBiomes = new HashSet<>(); - private static final Set netherBiomes = new HashSet<>(); - private static final Set endBiomes = new HashSet<>(); + private static final Set waterBiomes = new HashSet<>(); + private static final Set netherBiomes = new HashSet<>(); + private static final Set endBiomes = new HashSet<>(); static { Collections.addAll(waterBiomes, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.BEACH)); @@ -48,7 +48,7 @@ public class HabitatLocatorLogic { Collections.addAll(endBiomes, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.END)); } - private Set targetBiomes = new HashSet<>(); + private Set targetBiomes = new HashSet<>(); private boolean biomeFound = false; private int searchRadiusIteration = 0; private int searchAngleIteration = 0; @@ -58,7 +58,7 @@ public class HabitatLocatorLogic { return biomeFound; } - public Set getTargetBiomes() { + public Set getTargetBiomes() { return targetBiomes; } @@ -69,7 +69,7 @@ public class HabitatLocatorLogic { this.biomeFound = false; this.searchCenter = player.getPosition(); - BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords(searchCenter); + Biome currentBiome = player.worldObj.getBiome(searchCenter); removeInvalidBiomes(currentBiome, targetBiomes); // reset the locator coordinates @@ -99,7 +99,7 @@ public class HabitatLocatorLogic { } } - private BlockPos findNearestBiome(Entity player, Collection biomesToSearch) { + private BlockPos findNearestBiome(Entity player, Collection biomesToSearch) { BlockPos playerPos = player.getPosition(); // If we are in a valid spot, we point to ourselves. @@ -150,30 +150,30 @@ public class HabitatLocatorLogic { return null; } - private static BlockPos getChunkCoordinates(BlockPos pos, World world, Collection biomesToSearch) { - BiomeGenBase biome; + private static BlockPos getChunkCoordinates(BlockPos pos, World world, Collection biomesToSearch) { + Biome biome; - biome = world.getBiomeGenForCoords(pos); + biome = world.getBiome(pos); if (!biomesToSearch.contains(biome)) { return null; } - biome = world.getBiomeGenForCoords(pos.add(-minBiomeRadius, 0, 0)); + biome = world.getBiome(pos.add(-minBiomeRadius, 0, 0)); if (!biomesToSearch.contains(biome)) { return null; } - biome = world.getBiomeGenForCoords(pos.add(minBiomeRadius, 0, 0)); + biome = world.getBiome(pos.add(minBiomeRadius, 0, 0)); if (!biomesToSearch.contains(biome)) { return null; } - biome = world.getBiomeGenForCoords(pos.add(0, 0, -minBiomeRadius)); + biome = world.getBiome(pos.add(0, 0, -minBiomeRadius)); if (!biomesToSearch.contains(biome)) { return null; } - biome = world.getBiomeGenForCoords(pos.add(0, 0, minBiomeRadius)); + biome = world.getBiome(pos.add(0, 0, minBiomeRadius)); if (!biomesToSearch.contains(biome)) { return null; } @@ -181,7 +181,7 @@ public class HabitatLocatorLogic { return pos; } - private static void removeInvalidBiomes(BiomeGenBase currentBiome, Set biomesToSearch) { + private static void removeInvalidBiomes(Biome currentBiome, Set biomesToSearch) { biomesToSearch.removeAll(waterBiomes); diff --git a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java index b179882f3..f1a2305e1 100644 --- a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java +++ b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java @@ -18,7 +18,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -69,7 +69,7 @@ public class ItemHabitatLocator extends ItemWithGui implements ISpriteRegister { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { - BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords(player.getPosition()); + Biome currentBiome = player.worldObj.getBiome(player.getPosition()); float temperatureValue = ForestryAPI.climateManager.getTemperature(player.worldObj, player.getPosition()); EnumTemperature temperature = EnumTemperature.getFromValue(temperatureValue); diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 8caefcb29..9d6253d46 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -22,7 +22,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import com.mojang.authlib.GameProfile; @@ -56,7 +56,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple private final InventoryBeeHousing inventory; private final IBeekeepingLogic beekeepingLogic; - private BiomeGenBase cachedBiome; + private Biome cachedBiome; private float tempChange = 0.0f; private float humidChange = 0.0f; @@ -292,14 +292,15 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple } @Override - public void writeToNBT(NBTTagCompound data) { - super.writeToNBT(data); + public NBTTagCompound writeToNBT(NBTTagCompound data) { + data = super.writeToNBT(data); data.setFloat("TempChange", tempChange); data.setFloat("HumidChange", humidChange); beekeepingLogic.writeToNBT(data); inventory.writeToNBT(data); + return data; } @Override @@ -390,10 +391,10 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple } @Override - public BiomeGenBase getBiome() { + public Biome getBiome() { if (cachedBiome == null) { BlockPos coords = getReferenceCoord(); - cachedBiome = worldObj.getBiomeGenForCoords(coords); + cachedBiome = worldObj.getBiome(coords); } return cachedBiome; } diff --git a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java index a4d42f393..2fd766101 100644 --- a/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/FakeAlvearyController.java @@ -14,7 +14,7 @@ import java.util.Collections; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import com.mojang.authlib.GameProfile; @@ -81,7 +81,7 @@ public class FakeAlvearyController extends FakeMultiblockController implements I } @Override - public BiomeGenBase getBiome() { + public Biome getBiome() { return null; } diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java index be87fea96..0cc25e300 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java @@ -18,7 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeHousingInventory; @@ -84,7 +84,7 @@ public abstract class TileAlveary extends MultiblockTileEntityForestry 0); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); energyManager.writeToNBT(nbttagcompound); nbttagcompound.setInteger("Heating", workingTime); + return nbttagcompound; } /* Network */ diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java index 818cb4352..b4a8c2c81 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java @@ -127,9 +127,10 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory } } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); tankManager.writeToNBT(nbttagcompound); nbttagcompound.setInteger("TransferTime", transferTime); @@ -138,6 +139,7 @@ public class TileAlvearyHygroregulator extends TileAlveary implements IInventory currentRecipe.liquid.writeToNBT(subcompound); nbttagcompound.setTag("CurrentLiquid", subcompound); } + return nbttagcompound; } /* ILIQUIDTANKCONTAINER */ diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index 26623d90d..015315ea1 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.multiblock; +import javax.annotation.Nonnull; import java.util.Map.Entry; import java.util.Stack; @@ -168,9 +169,10 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, } } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); nbttagcompound.setBoolean("Active", active); NBTTagList nbttaglist = new NBTTagList(); @@ -184,6 +186,7 @@ public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, } } nbttagcompound.setTag("PendingSpawns", nbttaglist); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java index 5dc524a4e..d8507d435 100644 --- a/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java +++ b/src/main/java/forestry/apiculture/tiles/TileBeeHousingBase.java @@ -10,13 +10,13 @@ ******************************************************************************/ package forestry.apiculture.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import com.mojang.authlib.GameProfile; @@ -36,7 +36,7 @@ import forestry.core.tiles.TileBase; public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing, IClimatised, IGuiBeeHousingInventory, IStreamableGui { private final IBeekeepingLogic beeLogic; - private BiomeGenBase cachedBiome; + private Biome cachedBiome; // CLIENT private int breedingProgressPercent = 0; @@ -52,10 +52,12 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing } /* LOADING & SAVING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); beeLogic.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override @@ -64,10 +66,11 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing beeLogic.readFromNBT(nbttagcompound); } + @Nonnull @Override - public Packet getDescriptionPacket() { + public NBTTagCompound getUpdateTag() { beeLogic.syncToClient(); - return super.getDescriptionPacket(); + return super.getUpdateTag(); } /* ICLIMATISED */ @@ -142,9 +145,9 @@ public abstract class TileBeeHousingBase extends TileBase implements IBeeHousing // / IBEEHOUSING @Override - public BiomeGenBase getBiome() { + public Biome getBiome() { if (cachedBiome == null) { - cachedBiome = worldObj.getBiomeGenForCoordsBody(getPos()); + cachedBiome = worldObj.getBiome(getPos()); } return cachedBiome; } diff --git a/src/main/java/forestry/apiculture/tiles/TileCandle.java b/src/main/java/forestry/apiculture/tiles/TileCandle.java index 9ed8a603a..a0c005986 100644 --- a/src/main/java/forestry/apiculture/tiles/TileCandle.java +++ b/src/main/java/forestry/apiculture/tiles/TileCandle.java @@ -10,20 +10,41 @@ ******************************************************************************/ package forestry.apiculture.tiles; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; -import net.minecraft.tileentity.TileEntity; +import javax.annotation.Nonnull; -import forestry.apiculture.network.packets.PacketCandleUpdate; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; public class TileCandle extends TileEntity { private int colour; private boolean lit; + @Nonnull @Override - public Packet getDescriptionPacket() { - PacketCandleUpdate updateCandle = new PacketCandleUpdate(this); - return updateCandle.getPacket(); + public SPacketUpdateTileEntity getUpdatePacket() { + return new SPacketUpdateTileEntity(getPos(), 0, getUpdateTag()); + } + + @Override + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { + super.onDataPacket(net, pkt); + NBTTagCompound nbt = pkt.getNbtCompound(); + handleUpdateTag(nbt); + } + + @Nonnull + @Override + public NBTTagCompound getUpdateTag() { + NBTTagCompound tag = super.getUpdateTag(); + return writeToNBT(tag); + } + + @Override + public void handleUpdateTag(@Nonnull NBTTagCompound tag) { + super.handleUpdateTag(tag); + readFromNBT(tag); } public void onPacketUpdate(int colour, boolean isLit) { @@ -38,11 +59,13 @@ public class TileCandle extends TileEntity { lit = tagRoot.getBoolean("lit"); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound tagRoot) { - super.writeToNBT(tagRoot); + public NBTTagCompound writeToNBT(NBTTagCompound tagRoot) { + tagRoot = super.writeToNBT(tagRoot); tagRoot.setInteger("colour", this.colour); tagRoot.setBoolean("lit", this.lit); + return tagRoot; } public boolean isLit() { diff --git a/src/main/java/forestry/apiculture/tiles/TileHive.java b/src/main/java/forestry/apiculture/tiles/TileHive.java index 483212f9b..c5bd09449 100644 --- a/src/main/java/forestry/apiculture/tiles/TileHive.java +++ b/src/main/java/forestry/apiculture/tiles/TileHive.java @@ -11,6 +11,7 @@ package forestry.apiculture.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.Collections; import java.util.List; @@ -20,7 +21,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.ITickable; @@ -29,7 +30,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import com.mojang.authlib.GameProfile; @@ -186,11 +187,13 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv beeLogic.readFromNBT(nbttagcompound); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); contained.writeToNBT(nbttagcompound); beeLogic.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override @@ -252,10 +255,11 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv } } + @Nullable @Override - public Packet getDescriptionPacket() { + public SPacketUpdateTileEntity getUpdatePacket() { beeLogic.syncToClient(); - return super.getDescriptionPacket(); + return super.getUpdatePacket(); } @Override @@ -305,8 +309,8 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv } @Override - public BiomeGenBase getBiome() { - return getWorld().getBiomeGenForCoords(getPos()); + public Biome getBiome() { + return getWorld().getBiome(getPos()); } @Override diff --git a/src/main/java/forestry/apiculture/worldgen/Hive.java b/src/main/java/forestry/apiculture/worldgen/Hive.java index 0cc5094b9..832ed8eba 100644 --- a/src/main/java/forestry/apiculture/worldgen/Hive.java +++ b/src/main/java/forestry/apiculture/worldgen/Hive.java @@ -13,10 +13,11 @@ package forestry.apiculture.worldgen; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import forestry.api.apiculture.IHiveDrop; import forestry.api.apiculture.hives.IHiveDescription; @@ -55,7 +56,7 @@ public final class Hive { hiveDescription.postGen(world, pos); } - public boolean isGoodBiome(BiomeGenBase biome) { + public boolean isGoodBiome(Biome biome) { return hiveDescription.isGoodBiome(biome); } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java index e4b1adc88..57193ce5f 100755 --- a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java @@ -18,7 +18,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraftforge.common.util.EnumHelper; @@ -66,7 +66,7 @@ public abstract class HiveDecorator { Log.error("tried to generate a hive in an unloaded area."); return; } - BiomeGenBase biome = world.getBiomeGenForCoords(pos); + Biome biome = world.getBiome(pos); EnumHumidity humidity = EnumHumidity.getFromValue(biome.getRainfall()); for (Hive hive : hives) { @@ -84,7 +84,7 @@ public abstract class HiveDecorator { private static void decorateHivesDebug(World world, int chunkX, int chunkZ, List hives) { int worldX = (chunkX << 4) + 8; int worldZ = (chunkZ << 4) + 8; - BiomeGenBase biome = world.getBiomeGenForCoords(new BlockPos(chunkX, 0, chunkZ)); + Biome biome = world.getBiome(new BlockPos(chunkX, 0, chunkZ)); EnumHumidity humidity = EnumHumidity.getFromValue(biome.getRainfall()); for (int x = 0; x < 16; x++) { @@ -113,7 +113,7 @@ public abstract class HiveDecorator { return false; } - BiomeGenBase biome = world.getBiomeGenForCoords(hivePos); + Biome biome = world.getBiome(hivePos); EnumTemperature temperature = EnumTemperature.getFromValue(biome.getFloatTemperature(hivePos)); if (!hive.isGoodTemperature(temperature)) { return false; diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java index f2b40ea3b..30026f095 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescription.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescription.java @@ -19,7 +19,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; @@ -63,7 +63,7 @@ public enum HiveDescription implements IHiveDescription { JUNGLE(IHiveRegistry.HiveType.JUNGLE, 6.0f, BeeDefinition.TROPICAL, HiveManager.genHelper.tree()), END(IHiveRegistry.HiveType.END, 6.0f, BeeDefinition.ENDED, HiveManager.genHelper.ground(Blocks.END_STONE, Blocks.END_BRICKS)) { @Override - public boolean isGoodBiome(BiomeGenBase biome) { + public boolean isGoodBiome(Biome biome) { return BiomeDictionary.isBiomeOfType(biome, BiomeDictionary.Type.END); } }, @@ -122,7 +122,7 @@ public enum HiveDescription implements IHiveDescription { } @Override - public boolean isGoodBiome(BiomeGenBase biome) { + public boolean isGoodBiome(Biome biome) { return !BiomeHelper.isBiomeHellish(biome); } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java index e5671a614..dd195a9d6 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDescriptionSwarmer.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import forestry.api.apiculture.hives.IHiveDescription; import forestry.api.apiculture.hives.IHiveGen; @@ -48,7 +48,7 @@ public class HiveDescriptionSwarmer implements IHiveDescription { } @Override - public boolean isGoodBiome(BiomeGenBase biome) { + public boolean isGoodBiome(Biome biome) { return true; } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveGenGround.java b/src/main/java/forestry/apiculture/worldgen/HiveGenGround.java index 9f0ec51a5..20fa75831 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveGenGround.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveGenGround.java @@ -52,7 +52,7 @@ public class HiveGenGround extends HiveGen { IBlockState blockState = world.getBlockState(pos); while (isTreeBlock(blockState, world, pos) || canReplace(blockState, world, pos)) { - pos.offsetMutable(EnumFacing.DOWN); + pos.move(EnumFacing.DOWN); if (pos.getY() <= 0) { return null; } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java b/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java index f70e3f28b..df87c142c 100644 --- a/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveGenTree.java @@ -47,7 +47,7 @@ public class HiveGenTree extends HiveGen { // get to the bottom of the leaves final BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos(topPos); do { - pos.offsetMutable(EnumFacing.DOWN); + pos.move(EnumFacing.DOWN); blockState = world.getBlockState(pos); } while (isTreeBlock(blockState, world, pos)); diff --git a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java index 3c4befc21..aa2f9f6f9 100644 --- a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java @@ -28,7 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; @@ -337,7 +337,7 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { private static IBee getRandomVillageBee(World world, BlockPos pos) { // Get current biome - BiomeGenBase biome = world.getBiomeGenForCoords(pos); + Biome biome = world.getBiome(pos); List candidates; if (BeeManager.uncommonVillageBees != null && !BeeManager.uncommonVillageBees.isEmpty() && world.rand.nextDouble() < 0.2) { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockPile.java b/src/main/java/forestry/arboriculture/blocks/BlockPile.java index e4ccef467..cb48c8882 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockPile.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockPile.java @@ -1,12 +1,48 @@ package forestry.arboriculture.blocks; +import com.google.common.collect.Lists; + import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.Random; -import com.google.common.collect.Lists; +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.properties.IProperty; +import net.minecraft.block.properties.PropertyEnum; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.particle.ParticleManager; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import net.minecraftforge.common.property.ExtendedBlockState; +import net.minecraftforge.common.property.IExtendedBlockState; +import net.minecraftforge.common.property.IUnlistedProperty; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumPileType; @@ -31,51 +67,12 @@ import forestry.arboriculture.render.PileStateMapper; import forestry.arboriculture.tiles.TilePile; import forestry.core.PluginCore; import forestry.core.blocks.BlockStructure; -import forestry.core.blocks.IMachinePropertiesTesr; import forestry.core.blocks.propertys.UnlistedBlockAccess; import forestry.core.blocks.propertys.UnlistedBlockPos; import forestry.core.multiblock.MultiblockLogic; import forestry.core.proxy.Proxies; import forestry.core.render.ParticleHelper; import forestry.core.tiles.TileUtil; -import forestry.core.utils.ItemStackUtil; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDirt; -import net.minecraft.block.ITileEntityProvider; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemSpade; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.property.ExtendedBlockState; -import net.minecraftforge.common.property.IExtendedBlockState; -import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockPile extends BlockStructure implements ITileEntityProvider, IStateMapperRegister, ISpriteRegister { @@ -506,13 +503,13 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro @SideOnly(Side.CLIENT) @Override - public boolean addHitEffects(IBlockState state, World worldObj, RayTraceResult target, EffectRenderer effectRenderer) { + public boolean addHitEffects(IBlockState state, World worldObj, RayTraceResult target, ParticleManager effectRenderer) { return ParticleHelper.addBlockHitEffects(worldObj, target.getBlockPos(), target.sideHit, effectRenderer, particleCallback); } @SideOnly(Side.CLIENT) @Override - public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { IBlockState blockState = world.getBlockState(pos); return ParticleHelper.addDestroyEffects(world, this, blockState, pos, effectRenderer, particleCallback); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java index 8f754ade7..5f82bc2c4 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSapling.java @@ -147,13 +147,13 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat return tree.canStay(world, pos); } - + @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) { - super.onNeighborBlockChange(world, pos, state, neighborBlock); - if (!world.isRemote && !canBlockStay(world, pos)) { - dropAsSapling(world, pos); - world.setBlockToAir(pos); + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { + super.neighborChanged(state, worldIn, pos, blockIn); + if (!worldIn.isRemote && !canBlockStay(worldIn, pos)) { + dropAsSapling(worldIn, pos); + worldIn.setBlockToAir(pos); } } diff --git a/src/main/java/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java index 38d56daa5..a533aa3a2 100755 --- a/src/main/java/forestry/arboriculture/genetics/Tree.java +++ b/src/main/java/forestry/arboriculture/genetics/Tree.java @@ -92,8 +92,8 @@ public class Tree extends Individual implements ITree, IPlantable { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); NBTTagCompound nbtGenome = new NBTTagCompound(); genome.writeToNBT(nbtGenome); @@ -104,6 +104,7 @@ public class Tree extends Individual implements ITree, IPlantable { mate.writeToNBT(nbtMate); nbttagcompound.setTag("Mate", nbtMate); } + return nbttagcompound; } /* INTERACTION */ diff --git a/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java b/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java index 90c826269..c8b6fd834 100644 --- a/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java +++ b/src/main/java/forestry/arboriculture/multiblock/CharcoalPileController.java @@ -4,6 +4,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import net.minecraft.block.state.IBlockState; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.arboriculture.EnumPileType; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; @@ -22,11 +28,6 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.Log; import forestry.core.utils.Translator; -import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class CharcoalPileController extends RectangularMultiblockControllerBase implements ICharcoalPileControllerInternal { @@ -334,10 +335,11 @@ public class CharcoalPileController extends RectangularMultiblockControllerBase }*/ @Override - public void writeToNBT(NBTTagCompound data) { - super.writeToNBT(data); + public NBTTagCompound writeToNBT(NBTTagCompound data) { + data = super.writeToNBT(data); data.setInteger("BurnTime", burnTime); data.setBoolean("IsActive", active); + return data; } @Override diff --git a/src/main/java/forestry/arboriculture/render/PileParticleCallback.java b/src/main/java/forestry/arboriculture/render/PileParticleCallback.java index 45bdcd7bc..63a7ff682 100644 --- a/src/main/java/forestry/arboriculture/render/PileParticleCallback.java +++ b/src/main/java/forestry/arboriculture/render/PileParticleCallback.java @@ -1,24 +1,18 @@ package forestry.arboriculture.render; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.particle.ParticleDigging; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import forestry.api.arboriculture.EnumPileType; import forestry.arboriculture.blocks.BlockPile; import forestry.arboriculture.tiles.TilePile; -import forestry.core.blocks.BlockBase; -import forestry.core.proxy.Proxies; import forestry.core.render.ParticleHelper; import forestry.core.render.TextureManager; -import forestry.core.render.ParticleHelper.Callback; import forestry.core.tiles.TileUtil; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.renderer.BlockModelShapes; -import net.minecraft.client.renderer.BlockRendererDispatcher; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class PileParticleCallback extends ParticleHelper.DefaultCallback{ @@ -27,7 +21,7 @@ public class PileParticleCallback extends ParticleHelper.DefaultCallback implements ICharcoalPileComponent{ @@ -145,16 +148,17 @@ public class TilePile extends MultiblockTileEntityForestry 10) { WorldGenHelper.generateCylinderFromPos(world, leaf, leafCenter, leafRadius + girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); - leafCenter.offsetMutable(EnumFacing.DOWN); + leafCenter.move(EnumFacing.DOWN); } while (leafCenter.getY() > 6) { WorldGenHelper.generateCylinderFromPos(world, leaf, leafCenter, leafRadius + girth, 1, WorldGenHelper.EnumReplaceMode.SOFT); - leafCenter.offsetMutable(EnumFacing.DOWN); + leafCenter.move(EnumFacing.DOWN); } } } diff --git a/src/main/java/forestry/core/ClimateManager.java b/src/main/java/forestry/core/ClimateManager.java index 4a14e3f5d..05a8dca34 100644 --- a/src/main/java/forestry/core/ClimateManager.java +++ b/src/main/java/forestry/core/ClimateManager.java @@ -10,19 +10,20 @@ ******************************************************************************/ package forestry.core; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + import forestry.api.core.IClimateManager; import forestry.api.greenhouse.GreenhouseManager; import forestry.api.greenhouse.IGreenhouseState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; public class ClimateManager implements IClimateManager{ @Override public float getTemperature(World world, BlockPos pos) { IGreenhouseState state = GreenhouseManager.greenhouseHelper.getGreenhouseState(world, pos); - BiomeGenBase biome = world.getBiomeGenForCoords(pos); + Biome biome = world.getBiome(pos); if(state != null){ return state.getExactTemperature(); @@ -33,7 +34,7 @@ public class ClimateManager implements IClimateManager{ @Override public float getHumidity(World world, BlockPos pos) { IGreenhouseState state = GreenhouseManager.greenhouseHelper.getGreenhouseState(world, pos); - BiomeGenBase biome = world.getBiomeGenForCoords(pos); + Biome biome = world.getBiome(pos); if(state != null){ return state.getExactHumidity(); diff --git a/src/main/java/forestry/core/access/AccessHandler.java b/src/main/java/forestry/core/access/AccessHandler.java index 4877d3f67..0ded4908a 100644 --- a/src/main/java/forestry/core/access/AccessHandler.java +++ b/src/main/java/forestry/core/access/AccessHandler.java @@ -176,7 +176,7 @@ public final class AccessHandler implements IAccessHandler { } @Override - public void writeToNBT(NBTTagCompound data) { + public NBTTagCompound writeToNBT(NBTTagCompound data) { data.setInteger("Access", access.ordinal()); if (this.owner != null) { @@ -184,5 +184,6 @@ public final class AccessHandler implements IAccessHandler { PlayerUtil.writeGameProfile(nbt, owner); data.setTag("owner", nbt); } + return data; } } diff --git a/src/main/java/forestry/core/access/FakeAccessHandler.java b/src/main/java/forestry/core/access/FakeAccessHandler.java index db747aedf..997ba7ca0 100644 --- a/src/main/java/forestry/core/access/FakeAccessHandler.java +++ b/src/main/java/forestry/core/access/FakeAccessHandler.java @@ -105,8 +105,8 @@ public class FakeAccessHandler implements IAccessHandler { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/core/blocks/BlockBase.java b/src/main/java/forestry/core/blocks/BlockBase.java index cbadc808a..755ab31e2 100644 --- a/src/main/java/forestry/core/blocks/BlockBase.java +++ b/src/main/java/forestry/core/blocks/BlockBase.java @@ -17,7 +17,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -271,7 +271,7 @@ public class BlockBase

& IBlockType & IStringSerializable> ext /* Particles */ @SideOnly(Side.CLIENT) @Override - public boolean addHitEffects(IBlockState state, World worldObj, RayTraceResult target, EffectRenderer effectRenderer) { + public boolean addHitEffects(IBlockState state, World worldObj, RayTraceResult target, ParticleManager effectRenderer) { if (blockType.getMachineProperties() instanceof IMachinePropertiesTesr) { return ParticleHelper.addBlockHitEffects(worldObj, target.getBlockPos(), target.sideHit, effectRenderer, particleCallback); } @@ -280,7 +280,7 @@ public class BlockBase

& IBlockType & IStringSerializable> ext @SideOnly(Side.CLIENT) @Override - public boolean addDestroyEffects(World world, BlockPos pos, EffectRenderer effectRenderer) { + public boolean addDestroyEffects(World world, BlockPos pos, ParticleManager effectRenderer) { if (blockType.getMachineProperties() instanceof IMachinePropertiesTesr) { IBlockState blockState = world.getBlockState(pos); return ParticleHelper.addDestroyEffects(world, this, blockState, pos, effectRenderer, particleCallback); diff --git a/src/main/java/forestry/core/blocks/BlockForestry.java b/src/main/java/forestry/core/blocks/BlockForestry.java index e55224a28..b9351e942 100644 --- a/src/main/java/forestry/core/blocks/BlockForestry.java +++ b/src/main/java/forestry/core/blocks/BlockForestry.java @@ -78,9 +78,9 @@ public abstract class BlockForestry extends Block implements IItemModelRegister, } @Override - public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) { + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { try { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = worldIn.getTileEntity(pos); if (tile instanceof TileForestry) { ((TileForestry) tile).onNeighborBlockChange(state.getBlock()); } diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index 87f8d99b2..9be3db061 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -97,7 +97,7 @@ public class CircuitBoard implements ICircuitBoard { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setShort("T", (short) type.ordinal()); @@ -115,7 +115,7 @@ public class CircuitBoard implements ICircuitBoard { nbttagcompound.setString("CA.I" + i, circuit.getUID()); } - + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/core/circuits/CircuitLibrary.java b/src/main/java/forestry/core/circuits/CircuitLibrary.java index 5dde1a6b1..0cf13b9fc 100755 --- a/src/main/java/forestry/core/circuits/CircuitLibrary.java +++ b/src/main/java/forestry/core/circuits/CircuitLibrary.java @@ -22,11 +22,12 @@ public class CircuitLibrary extends WorldSavedData implements ICircuitLibrary { } @Override - public void readFromNBT(NBTTagCompound var1) { + public void readFromNBT(NBTTagCompound nbt) { } @Override - public void writeToNBT(NBTTagCompound var1) { + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + return nbt; } } diff --git a/src/main/java/forestry/core/entities/EntityFXColoredDripParticle.java b/src/main/java/forestry/core/entities/ParticleColoredDripParticle.java similarity index 93% rename from src/main/java/forestry/core/entities/EntityFXColoredDripParticle.java rename to src/main/java/forestry/core/entities/ParticleColoredDripParticle.java index 5171c07ec..ba1a8cf61 100644 --- a/src/main/java/forestry/core/entities/EntityFXColoredDripParticle.java +++ b/src/main/java/forestry/core/entities/ParticleColoredDripParticle.java @@ -14,19 +14,19 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.Particle; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -public class EntityFXColoredDripParticle extends EntityFX { +public class ParticleColoredDripParticle extends Particle { /** * The height of the current bob */ private int bobTimer; - public EntityFXColoredDripParticle(World world, double x, double y, double z, float red, float green, float blue) { + public ParticleColoredDripParticle(World world, double x, double y, double z, float red, float green, float blue) { super(world, x, y, z); this.particleRed = red; this.particleGreen = green; diff --git a/src/main/java/forestry/core/entities/EntityFXHoneydust.java b/src/main/java/forestry/core/entities/ParticleHoneydust.java similarity index 83% rename from src/main/java/forestry/core/entities/EntityFXHoneydust.java rename to src/main/java/forestry/core/entities/ParticleHoneydust.java index 59891a70e..a8857f3b4 100644 --- a/src/main/java/forestry/core/entities/EntityFXHoneydust.java +++ b/src/main/java/forestry/core/entities/ParticleHoneydust.java @@ -10,12 +10,12 @@ ******************************************************************************/ package forestry.core.entities; -import net.minecraft.client.particle.EntityReddustFX; +import net.minecraft.client.particle.ParticleRedstone; import net.minecraft.world.World; -public class EntityFXHoneydust extends EntityReddustFX { +public class ParticleHoneydust extends ParticleRedstone { - public EntityFXHoneydust(World world, double x, double y, double z, float f1, float f2, float f3) { + public ParticleHoneydust(World world, double x, double y, double z, float f1, float f2, float f3) { super(world, x, y, z, 1.0F, f1, f2, f3); particleRed = 0.9F + world.rand.nextFloat() * 0.1F; particleGreen = 0.75F + world.rand.nextFloat() * 0.2F; diff --git a/src/main/java/forestry/core/entities/EntityFXIgnition.java b/src/main/java/forestry/core/entities/ParticleIgnition.java similarity index 92% rename from src/main/java/forestry/core/entities/EntityFXIgnition.java rename to src/main/java/forestry/core/entities/ParticleIgnition.java index 048861962..8985556eb 100644 --- a/src/main/java/forestry/core/entities/EntityFXIgnition.java +++ b/src/main/java/forestry/core/entities/ParticleIgnition.java @@ -1,84 +1,84 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.entities; - -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.VertexBuffer; -import net.minecraft.entity.Entity; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.world.World; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class EntityFXIgnition extends EntityFX { - private final float ignitionParticleScale; - - public EntityFXIgnition(World world, double x, double y, double z) { - super(world, x, y, z, 0, 0, 0); - this.motionX *= 0.8; - this.motionY *= 0.8; - this.motionZ *= 0.8; - this.motionY = this.rand.nextFloat() * 0.4F + 0.05F; - this.particleRed = this.particleGreen = this.particleBlue = 1.0F; - this.particleScale *= this.rand.nextFloat() / 2 + 0.3F; - this.ignitionParticleScale = this.particleScale; - this.particleMaxAge = (int) (16.0 / (Math.random() * 0.8 + 0.2)); - this.setParticleTextureIndex(49); - } - - @Override - public int getBrightnessForRender(float p_70070_1_) { - int i = super.getBrightnessForRender(p_70070_1_); - short short1 = 240; - int j = i >> 16 & 255; - return short1 | j << 16; - } - - @Override - public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { - float f6 = (this.particleAge + partialTicks) / this.particleMaxAge; - this.particleScale = this.ignitionParticleScale * (1.0F - f6 * f6); - super.renderParticle(worldRendererIn, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); - } - - /** - * Called to update the entity's position/logic. - */ - @Override - public void onUpdate() { - this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; - - if (this.particleAge++ >= this.particleMaxAge) { - this.setExpired(); - } - - float f = (float) this.particleAge / (float) this.particleMaxAge; - - if (this.rand.nextFloat() > f * 2) { - this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ); - } - - this.motionY -= 0.03D; - this.moveEntity(this.motionX, this.motionY, this.motionZ); - this.motionX *= 0.999D; - this.motionY *= 0.999D; - this.motionZ *= 0.999D; - - if (this.isCollided) { - this.motionX *= 0.7; - this.motionZ *= 0.7; - } - } +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.entities; + +import net.minecraft.client.particle.Particle; +import net.minecraft.client.renderer.VertexBuffer; +import net.minecraft.entity.Entity; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.world.World; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ParticleIgnition extends Particle { + private final float ignitionParticleScale; + + public ParticleIgnition(World world, double x, double y, double z) { + super(world, x, y, z, 0, 0, 0); + this.motionX *= 0.8; + this.motionY *= 0.8; + this.motionZ *= 0.8; + this.motionY = this.rand.nextFloat() * 0.4F + 0.05F; + this.particleRed = this.particleGreen = this.particleBlue = 1.0F; + this.particleScale *= this.rand.nextFloat() / 2 + 0.3F; + this.ignitionParticleScale = this.particleScale; + this.particleMaxAge = (int) (16.0 / (Math.random() * 0.8 + 0.2)); + this.setParticleTextureIndex(49); + } + + @Override + public int getBrightnessForRender(float p_70070_1_) { + int i = super.getBrightnessForRender(p_70070_1_); + short short1 = 240; + int j = i >> 16 & 255; + return short1 | j << 16; + } + + @Override + public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) { + float f6 = (this.particleAge + partialTicks) / this.particleMaxAge; + this.particleScale = this.ignitionParticleScale * (1.0F - f6 * f6); + super.renderParticle(worldRendererIn, entityIn, partialTicks, rotationX, rotationZ, rotationYZ, rotationXY, rotationXZ); + } + + /** + * Called to update the entity's position/logic. + */ + @Override + public void onUpdate() { + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + if (this.particleAge++ >= this.particleMaxAge) { + this.setExpired(); + } + + float f = (float) this.particleAge / (float) this.particleMaxAge; + + if (this.rand.nextFloat() > f * 2) { + this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, this.posX, this.posY, this.posZ, this.motionX, this.motionY, this.motionZ); + } + + this.motionY -= 0.03D; + this.moveEntity(this.motionX, this.motionY, this.motionZ); + this.motionX *= 0.999D; + this.motionY *= 0.999D; + this.motionZ *= 0.999D; + + if (this.isCollided) { + this.motionX *= 0.7; + this.motionZ *= 0.7; + } + } } \ No newline at end of file diff --git a/src/main/java/forestry/core/entities/EntityFXSmoke.java b/src/main/java/forestry/core/entities/ParticleSmoke.java similarity index 94% rename from src/main/java/forestry/core/entities/EntityFXSmoke.java rename to src/main/java/forestry/core/entities/ParticleSmoke.java index 937196a1c..c91041669 100644 --- a/src/main/java/forestry/core/entities/EntityFXSmoke.java +++ b/src/main/java/forestry/core/entities/ParticleSmoke.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.core.entities; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.entity.Entity; import net.minecraft.util.EnumParticleTypes; @@ -20,10 +20,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class EntityFXSmoke extends EntityFX { +public class ParticleSmoke extends Particle { private final float ignitionParticleScale; - public EntityFXSmoke(World world, double x, double y, double z) { + public ParticleSmoke(World world, double x, double y, double z) { super(world, x, y, z, 0, 0, 0); this.motionX *= 0.8; this.motionY *= 0.8; diff --git a/src/main/java/forestry/core/entities/EntityFXSnow.java b/src/main/java/forestry/core/entities/ParticleSnow.java similarity index 95% rename from src/main/java/forestry/core/entities/EntityFXSnow.java rename to src/main/java/forestry/core/entities/ParticleSnow.java index a528d62ba..426152a0f 100644 --- a/src/main/java/forestry/core/entities/EntityFXSnow.java +++ b/src/main/java/forestry/core/entities/ParticleSnow.java @@ -10,17 +10,17 @@ ******************************************************************************/ package forestry.core.entities; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.world.World; -public class EntityFXSnow extends EntityFX { +public class ParticleSnow extends Particle { public static TextureAtlasSprite sprites[]; - public EntityFXSnow(World world, double x, double y, double z) { + public ParticleSnow(World world, double x, double y, double z) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); this.setParticleTexture(sprites[rand.nextInt(sprites.length)]); diff --git a/src/main/java/forestry/core/fluids/BlockForestryFluid.java b/src/main/java/forestry/core/fluids/BlockForestryFluid.java index 6972a1a82..7d890a0b3 100644 --- a/src/main/java/forestry/core/fluids/BlockForestryFluid.java +++ b/src/main/java/forestry/core/fluids/BlockForestryFluid.java @@ -17,7 +17,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.Particle; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; @@ -38,7 +38,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; -import forestry.core.entities.EntityFXColoredDripParticle; +import forestry.core.entities.ParticleColoredDripParticle; public class BlockForestryFluid extends BlockFluidClassic implements IItemModelRegister { @@ -120,7 +120,7 @@ public class BlockForestryFluid extends BlockFluidClassic implements IItemModelR double py = d1 - 1.05D; double pz = d2 + rand.nextFloat(); - EntityFX fx = new EntityFXColoredDripParticle(worldIn, px, py, pz, color.getRed(), color.getGreen(), color.getBlue()); + Particle fx = new ParticleColoredDripParticle(worldIn, px, py, pz, color.getRed(), color.getGreen(), color.getBlue()); FMLClientHandler.instance().getClient().effectRenderer.addEffect(fx); } } diff --git a/src/main/java/forestry/core/fluids/FakeTankManager.java b/src/main/java/forestry/core/fluids/FakeTankManager.java index 328b7744e..f74aed749 100644 --- a/src/main/java/forestry/core/fluids/FakeTankManager.java +++ b/src/main/java/forestry/core/fluids/FakeTankManager.java @@ -13,7 +13,7 @@ package forestry.core.fluids; import java.util.List; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; @@ -31,12 +31,12 @@ public class FakeTankManager implements ITankManager { } @Override - public void containerAdded(Container container, ICrafting player) { + public void containerAdded(Container container, IContainerListener player) { } @Override - public void updateGuiData(Container container, List crafters) { + public void updateGuiData(Container container, List crafters) { } diff --git a/src/main/java/forestry/core/fluids/ITankManager.java b/src/main/java/forestry/core/fluids/ITankManager.java index c5964d9d5..3bee22d98 100644 --- a/src/main/java/forestry/core/fluids/ITankManager.java +++ b/src/main/java/forestry/core/fluids/ITankManager.java @@ -13,16 +13,16 @@ package forestry.core.fluids; import java.util.List; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; public interface ITankManager extends IFluidHandler { - void containerAdded(Container container, ICrafting crafter); + void containerAdded(Container container, IContainerListener crafter); - void updateGuiData(Container container, List crafters); + void updateGuiData(Container container, List crafters); void containerRemoved(Container container); diff --git a/src/main/java/forestry/core/fluids/PipetteContents.java b/src/main/java/forestry/core/fluids/PipetteContents.java index 147239abd..d9a31bc3d 100644 --- a/src/main/java/forestry/core/fluids/PipetteContents.java +++ b/src/main/java/forestry/core/fluids/PipetteContents.java @@ -59,7 +59,8 @@ public class PipetteContents implements INbtWritable { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { contents.writeToNBT(nbttagcompound); + return nbttagcompound; } } diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index e3256c730..f59f5f072 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -23,7 +23,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; @@ -90,7 +90,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } @Override - public void writeToNBT(NBTTagCompound data) { + public NBTTagCompound writeToNBT(NBTTagCompound data) { NBTTagList tagList = new NBTTagList(); for (byte slot = 0; slot < tanks.size(); slot++) { StandardTank tank = tanks.get(slot); @@ -102,6 +102,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } } data.setTag("tanks", tagList); + return data; } @Override @@ -132,12 +133,12 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } @Override - public void containerAdded(Container container, ICrafting player) { + public void containerAdded(Container container, IContainerListener player) { if (!(player instanceof EntityPlayerMP)) { return; } - List crafters = Collections.singletonList(player); + List crafters = Collections.singletonList(player); for (StandardTank tank : tanks) { sendTankUpdate(container, tank, crafters); @@ -152,13 +153,13 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl } @Override - public void updateGuiData(Container container, List crafters) { + public void updateGuiData(Container container, List crafters) { for (StandardTank tank : tanks) { updateGuiData(container, crafters, tank.getTankIndex()); } } - private void updateGuiData(Container container, List crafters, int tankIndex) { + private void updateGuiData(Container container, List crafters, int tankIndex) { StandardTank tank = tanks.get(tankIndex); if (tank == null) { return; @@ -173,11 +174,11 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl sendTankUpdate(container, tank, crafters); } - private void sendTankUpdate(Container container, StandardTank tank, Iterable crafters) { + private void sendTankUpdate(Container container, StandardTank tank, Iterable crafters) { int tankIndex = tank.getTankIndex(); FluidStack fluid = tank.getFluid(); IForestryPacketClient packet = new PacketTankLevelUpdate(tile, tankIndex, fluid); - for (ICrafting crafter : crafters) { + for (IContainerListener crafter : crafters) { if (crafter instanceof EntityPlayerMP) { Proxies.net.sendToPlayer(packet, (EntityPlayerMP) crafter); } diff --git a/src/main/java/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java index dd94c2bf4..339a61a05 100755 --- a/src/main/java/forestry/core/genetics/BreedingTracker.java +++ b/src/main/java/forestry/core/genetics/BreedingTracker.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.genetics; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Collection; import java.util.Collections; @@ -140,7 +141,7 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin } @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { + public void readFromNBT(@Nonnull NBTTagCompound nbttagcompound) { if (nbttagcompound.hasKey(MODE_NAME_KEY)) { modeName = nbttagcompound.getString(MODE_NAME_KEY); @@ -151,9 +152,11 @@ public abstract class BreedingTracker extends WorldSavedData implements IBreedin readValuesFromNBT(nbttagcompound, researchedMutations, RESEARCHED_COUNT_KEY, RESEARCHED_KEY); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { writeToNBT(nbttagcompound, discoveredSpecies, discoveredMutations, researchedMutations); + return nbttagcompound; } private void writeToNBT(NBTTagCompound nbtTagCompound, Collection discoveredSpecies, Collection discoveredMutations, Collection researchedMutations) { diff --git a/src/main/java/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java index 22b9941f9..142c25415 100755 --- a/src/main/java/forestry/core/genetics/Chromosome.java +++ b/src/main/java/forestry/core/genetics/Chromosome.java @@ -46,9 +46,10 @@ public class Chromosome implements IChromosome { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setString(UID0_TAG, primary.getUID()); nbttagcompound.setString(UID1_TAG, secondary.getUID()); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/core/genetics/EffectData.java b/src/main/java/forestry/core/genetics/EffectData.java index bd28f14a9..0e14cf15a 100755 --- a/src/main/java/forestry/core/genetics/EffectData.java +++ b/src/main/java/forestry/core/genetics/EffectData.java @@ -64,6 +64,7 @@ public class EffectData implements IEffectData { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + return nbttagcompound; } } diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index 4370a86e4..192583779 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -18,6 +18,7 @@ import java.util.Arrays; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; + import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IChromosome; @@ -198,7 +199,7 @@ public abstract class Genome implements IGenome { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { NBTTagList nbttaglist = new NBTTagList(); for (int i = 0; i < chromosomes.length; i++) { @@ -210,6 +211,7 @@ public abstract class Genome implements IGenome { } } nbttagcompound.setTag("Chromosomes", nbttaglist); + return nbttagcompound; } // / INFORMATION RETRIEVAL diff --git a/src/main/java/forestry/core/genetics/Individual.java b/src/main/java/forestry/core/genetics/Individual.java index 4a9d5fb8d..cd85cd0b7 100755 --- a/src/main/java/forestry/core/genetics/Individual.java +++ b/src/main/java/forestry/core/genetics/Individual.java @@ -45,8 +45,9 @@ public abstract class Individual implements IIndividual { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setBoolean("IsAnalyzed", isAnalyzed); + return nbttagcompound; } /* IDENTIFICATION */ diff --git a/src/main/java/forestry/core/genetics/IndividualLiving.java b/src/main/java/forestry/core/genetics/IndividualLiving.java index 9ff968f60..3bcaa6b0f 100755 --- a/src/main/java/forestry/core/genetics/IndividualLiving.java +++ b/src/main/java/forestry/core/genetics/IndividualLiving.java @@ -37,9 +37,9 @@ public abstract class IndividualLiving extends Individual implements IIndividual } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + nbttagcompound = super.writeToNBT(nbttagcompound); nbttagcompound.setInteger("Health", health); nbttagcompound.setInteger("MaxH", maxHealth); @@ -54,7 +54,7 @@ public abstract class IndividualLiving extends Individual implements IIndividual getMate().writeToNBT(nbtMate); nbttagcompound.setTag("Mate", nbtMate); } - + return nbttagcompound; } /* GENERATION */ diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index 214e1c5d1..74695b9c3 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -232,7 +232,7 @@ public class ItemResearchNote extends ItemForestry { } } - public void writeToNBT(NBTTagCompound compound) { + public NBTTagCompound writeToNBT(NBTTagCompound compound) { if (this.researcher != null) { NBTTagCompound nbt = new NBTTagCompound(); PlayerUtil.writeGameProfile(nbt, researcher); @@ -240,6 +240,7 @@ public class ItemResearchNote extends ItemForestry { } compound.setByte("TYP", (byte) type.ordinal()); compound.setTag("INN", inner); + return compound; } public void addTooltip(List list) { diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java index 3a2ae72ea..8f7e252a8 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionBiome.java @@ -16,7 +16,7 @@ import java.util.Locale; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; @@ -35,7 +35,7 @@ public class MutationConditionBiome implements IMutationCondition { @Override public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - BiomeGenBase biome = world.getBiomeGenForCoords(pos); + Biome biome = world.getBiome(pos); for (BiomeDictionary.Type type : validBiomeTypes) { if (BiomeDictionary.isBiomeOfType(biome, type)) { return 1; diff --git a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java index edc83b05d..8d9875eb9 100644 --- a/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java +++ b/src/main/java/forestry/core/genetics/mutations/MutationConditionTemperature.java @@ -12,7 +12,7 @@ package forestry.core.genetics.mutations; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; @@ -33,7 +33,7 @@ public class MutationConditionTemperature implements IMutationCondition { @Override public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { - BiomeGenBase biome = world.getBiomeProvider().getBiomeGenerator(pos); + Biome biome = world.getBiomeProvider().getBiome(pos); EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, world, pos); if (biomeTemperature.ordinal() < minTemperature.ordinal() || biomeTemperature.ordinal() > maxTemperature.ordinal()) { diff --git a/src/main/java/forestry/core/gui/ContainerForestry.java b/src/main/java/forestry/core/gui/ContainerForestry.java index 49d3d5194..eef4e19c8 100644 --- a/src/main/java/forestry/core/gui/ContainerForestry.java +++ b/src/main/java/forestry/core/gui/ContainerForestry.java @@ -20,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ClickType; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -97,7 +97,7 @@ public abstract class ContainerForestry extends Container { protected abstract boolean canAccess(EntityPlayer player); protected final void sendPacketToListeners(IForestryPacketClient packet) { - for (ICrafting listener : listeners) { + for (IContainerListener listener : listeners) { if (listener instanceof EntityPlayer) { Proxies.net.sendToPlayer(packet, (EntityPlayer) listener); } else { diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index 0816fb523..c8a3bcb7d 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -13,7 +13,7 @@ package forestry.core.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.IFluidTank; @@ -46,7 +46,7 @@ public abstract class ContainerLiquidTanks i } @Override - public void writeToNBT(NBTTagCompound data) { + public NBTTagCompound writeToNBT(NBTTagCompound data) { if (isMultiblockSaveDelegate() && isConnected()) { NBTTagCompound multiblockData = new NBTTagCompound(); this.controller.writeToNBT(multiblockData); data.setTag("multiblockData", multiblockData); } + return data; } public final void assertDetached(IMultiblockComponent part) { diff --git a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java index 27cf8834d..e393cac5b 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java @@ -61,9 +61,10 @@ public abstract class MultiblockTileEntityForestry e getInternalInventory().readFromNBT(data); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound data) { - super.writeToNBT(data); + public NBTTagCompound writeToNBT(NBTTagCompound data) { + data = super.writeToNBT(data); if (this.owner != null) { NBTTagCompound nbt = new NBTTagCompound(); @@ -72,6 +73,7 @@ public abstract class MultiblockTileEntityForestry e } getInternalInventory().writeToNBT(data); + return data; } /* INVENTORY */ diff --git a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java index 91a11ad55..cb8bea5ca 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java @@ -10,7 +10,7 @@ import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -315,7 +315,7 @@ public class MultiblockWorldRegistry { if (worldObj.getChunkProvider().getLoadedChunk(worldLocation.getX() >> 4, worldLocation.getZ() >> 4) == null) { // Part goes into the waiting-for-chunk-load list Set partSet; - long chunkHash = ChunkCoordIntPair.chunkXZ2Int(worldLocation.getX() >> 4, worldLocation.getZ() >> 4); + long chunkHash = ChunkPos.chunkXZ2Int(worldLocation.getX() >> 4, worldLocation.getZ() >> 4); synchronized (partsAwaitingChunkLoadMutex) { if (!partsAwaitingChunkLoad.containsKey(chunkHash)) { partSet = new HashSet<>(); @@ -340,7 +340,7 @@ public class MultiblockWorldRegistry { public void onPartRemovedFromWorld(IMultiblockComponent part) { BlockPos coord = part.getCoordinates(); if (coord != null) { - long hash = ChunkCoordIntPair.chunkXZ2Int(coord.getX() >> 4, coord.getZ() >> 4); + long hash = ChunkPos.chunkXZ2Int(coord.getX() >> 4, coord.getZ() >> 4); if (partsAwaitingChunkLoad.containsKey(hash)) { synchronized (partsAwaitingChunkLoadMutex) { @@ -396,7 +396,7 @@ public class MultiblockWorldRegistry { * @param chunkZ Chunk Z coordinate (world coordate >> 4) of the chunk that was loaded */ public void onChunkLoaded(int chunkX, int chunkZ) { - long chunkHash = ChunkCoordIntPair.chunkXZ2Int(chunkX, chunkZ); + long chunkHash = ChunkPos.chunkXZ2Int(chunkX, chunkZ); if (partsAwaitingChunkLoad.containsKey(chunkHash)) { synchronized (partsAwaitingChunkLoadMutex) { if (partsAwaitingChunkLoad.containsKey(chunkHash)) { diff --git a/src/main/java/forestry/core/proxy/ProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetwork.java index 861c1c02f..105431c06 100755 --- a/src/main/java/forestry/core/proxy/ProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ProxyNetwork.java @@ -12,7 +12,7 @@ package forestry.core.proxy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.management.PlayerManager; +import net.minecraft.server.management.PlayerChunkMap; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -31,7 +31,7 @@ public class ProxyNetwork { } WorldServer worldServer = (WorldServer) world; - PlayerManager playerManager = worldServer.getPlayerChunkMap(); + PlayerChunkMap playerManager = worldServer.getPlayerChunkMap(); int chunkX = packet.getPos().getX() >> 4; int chunkZ = packet.getPos().getZ() >> 4; diff --git a/src/main/java/forestry/core/proxy/ProxyNetworkClient.java b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java index 34846f2dc..8a43af080 100644 --- a/src/main/java/forestry/core/proxy/ProxyNetworkClient.java +++ b/src/main/java/forestry/core/proxy/ProxyNetworkClient.java @@ -18,9 +18,9 @@ public class ProxyNetworkClient extends ProxyNetwork { @Override public void sendToServer(IForestryPacketServer packet) { - NetHandlerPlayClient netHandler = Proxies.common.getClientInstance().getNetHandler(); + NetHandlerPlayClient netHandler = Proxies.common.getClientInstance().getConnection(); if (netHandler != null) { - netHandler.addToSendQueue(packet.getPacket()); + netHandler.sendPacket(packet.getPacket()); } } } diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index b3487d685..f41dcfbd4 100644 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -31,6 +31,7 @@ import net.minecraftforge.common.model.animation.IAnimationStateMachine; import forestry.core.fluids.Fluids; import forestry.core.models.BlockModelIndex; import forestry.core.models.ModelIndex; +import forestry.core.tiles.TileAnalyzer; import forestry.core.tiles.TileBase; import forestry.core.tiles.TileEscritoire; import forestry.core.tiles.TileMill; @@ -71,7 +72,7 @@ public class ProxyRender { } @Nullable - public TileEntitySpecialRenderer getRendererAnalyzer() { + public TileEntitySpecialRenderer getRendererAnalyzer() { return null; } diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index 0ac7822b1..57b4a6363 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -18,8 +18,8 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -44,10 +44,10 @@ import forestry.apiculture.entities.ParticleBee; import forestry.apiculture.render.TextureHabitatLocator; import forestry.core.config.Config; import forestry.core.config.Constants; -import forestry.core.entities.EntityFXHoneydust; -import forestry.core.entities.EntityFXIgnition; -import forestry.core.entities.EntityFXSmoke; -import forestry.core.entities.EntityFXSnow; +import forestry.core.entities.ParticleHoneydust; +import forestry.core.entities.ParticleIgnition; +import forestry.core.entities.ParticleSmoke; +import forestry.core.entities.ParticleSnow; import forestry.core.fluids.Fluids; import forestry.core.models.BlockModelIndex; import forestry.core.models.ModelIndex; @@ -195,8 +195,8 @@ public class ProxyRenderClient extends ProxyRender { if (!flowerPositions.isEmpty()) { BlockPos destination = flowerPositions.get(world.rand.nextInt(flowerPositions.size())); - EntityFX particle = new ParticleBee(world, x, y, z, color, destination); - EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; + Particle particle = new ParticleBee(world, x, y, z, color, destination); + ParticleManager effectRenderer = Minecraft.getMinecraft().effectRenderer; effectRenderer.addEffect(particle); } } @@ -207,8 +207,8 @@ public class ProxyRenderClient extends ProxyRender { return; } - EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; - effectRenderer.addEffect(new EntityFXHoneydust(world, x, y, z, 0, 0, 0)); + ParticleManager effectRenderer = Minecraft.getMinecraft().effectRenderer; + effectRenderer.addEffect(new ParticleHoneydust(world, x, y, z, 0, 0, 0)); } @Override @@ -217,9 +217,9 @@ public class ProxyRenderClient extends ProxyRender { return; } - EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; - EntityFX entityfx = effectRenderer.spawnEffectParticle(EnumParticleTypes.EXPLOSION_NORMAL.getParticleID(), x, y, z, 0, 0, 0); - effectRenderer.addEffect(entityfx); + ParticleManager effectRenderer = Minecraft.getMinecraft().effectRenderer; + Particle Particle = effectRenderer.spawnEffectParticle(EnumParticleTypes.EXPLOSION_NORMAL.getParticleID(), x, y, z, 0, 0, 0); + effectRenderer.addEffect(Particle); } @Override @@ -228,8 +228,8 @@ public class ProxyRenderClient extends ProxyRender { return; } - EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; - effectRenderer.addEffect(new EntityFXSnow(world, x + world.rand.nextGaussian(), y, z + world.rand.nextGaussian())); + ParticleManager effectRenderer = Minecraft.getMinecraft().effectRenderer; + effectRenderer.addEffect(new ParticleSnow(world, x + world.rand.nextGaussian(), y, z + world.rand.nextGaussian())); } @Override @@ -238,8 +238,8 @@ public class ProxyRenderClient extends ProxyRender { return; } - EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; - effectRenderer.addEffect(new EntityFXIgnition(world, x, y, z)); + ParticleManager effectRenderer = Minecraft.getMinecraft().effectRenderer; + effectRenderer.addEffect(new ParticleIgnition(world, x, y, z)); } @Override @@ -248,8 +248,8 @@ public class ProxyRenderClient extends ProxyRender { return; } - EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; - effectRenderer.addEffect(new EntityFXSmoke(world, x, y, z)); + ParticleManager effectRenderer = Minecraft.getMinecraft().effectRenderer; + effectRenderer.addEffect(new ParticleSmoke(world, x, y, z)); } @Override @@ -262,11 +262,11 @@ public class ProxyRenderClient extends ProxyRender { float green = (color >> 8 & 255) / 255.0F; float blue = (color & 255) / 255.0F; - EffectRenderer effectRenderer = Minecraft.getMinecraft().effectRenderer; - EntityFX entityfx = effectRenderer.spawnEffectParticle(EnumParticleTypes.SPELL.getParticleID(), x, y, z, 0, 0, 0); - entityfx.setRBGColorF(red, green, blue); + ParticleManager effectRenderer = Minecraft.getMinecraft().effectRenderer; + Particle Particle = effectRenderer.spawnEffectParticle(EnumParticleTypes.SPELL.getParticleID(), x, y, z, 0, 0, 0); + Particle.setRBGColorF(red, green, blue); - effectRenderer.addEffect(entityfx); + effectRenderer.addEffect(Particle); } private static class BlockModeStateMapper extends StateMapperBase { diff --git a/src/main/java/forestry/core/render/MachineParticleCallback.java b/src/main/java/forestry/core/render/MachineParticleCallback.java index 9453ebf73..9951da0c8 100644 --- a/src/main/java/forestry/core/render/MachineParticleCallback.java +++ b/src/main/java/forestry/core/render/MachineParticleCallback.java @@ -12,12 +12,13 @@ package forestry.core.render; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.client.particle.ParticleDigging; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import forestry.core.blocks.BlockBase; import forestry.core.blocks.IBlockType; import forestry.core.blocks.IMachineProperties; @@ -34,7 +35,7 @@ public class MachineParticleCallback

& IBlockType & IStringSer } @Override - protected void setTexture(EntityDiggingFX fx, World world, BlockPos pos, IBlockState state) { + protected void setTexture(ParticleDigging fx, World world, BlockPos pos, IBlockState state) { IMachineProperties machineProperties = blockType.getMachineProperties(); if(machineProperties instanceof IMachinePropertiesTesr){ Minecraft minecraft = Proxies.common.getClientInstance(); diff --git a/src/main/java/forestry/core/render/ParticleHelper.java b/src/main/java/forestry/core/render/ParticleHelper.java index 9928f984e..7c64d01a4 100644 --- a/src/main/java/forestry/core/render/ParticleHelper.java +++ b/src/main/java/forestry/core/render/ParticleHelper.java @@ -10,21 +10,19 @@ ******************************************************************************/ package forestry.core.render; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.particle.EntityDiggingFX; +import net.minecraft.client.particle.ParticleDigging; +import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.renderer.BlockModelShapes; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumBlockRenderType; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -37,10 +35,8 @@ import forestry.core.proxy.Proxies; */ public class ParticleHelper { - private static final Random rand = new Random(); - @SideOnly(Side.CLIENT) - public static boolean addBlockHitEffects(World world, BlockPos pos, EnumFacing side, EffectRenderer effectRenderer, Callback callback) { + public static boolean addBlockHitEffects(World world, BlockPos pos, EnumFacing side, ParticleManager effectRenderer, Callback callback) { IBlockState iblockstate = world.getBlockState(pos); if(iblockstate.getRenderType() != EnumBlockRenderType.INVISIBLE) { int x = pos.getX(); @@ -75,7 +71,7 @@ public class ParticleHelper { px = x + axisalignedbb.maxX + f; } - EntityDiggingFX fx = (EntityDiggingFX) effectRenderer.spawnEffectParticle(EnumParticleTypes.BLOCK_DUST.getParticleID(), px, py, pz, 0.0D, 0.0D, 0.0D, Block.getStateId(iblockstate)); + ParticleDigging fx = (ParticleDigging) effectRenderer.spawnEffectParticle(EnumParticleTypes.BLOCK_DUST.getParticleID(), px, py, pz, 0.0D, 0.0D, 0.0D, Block.getStateId(iblockstate)); callback.addHitEffects(fx, world, pos, iblockstate); effectRenderer.addEffect(fx.setBlockPos(new BlockPos(x, y, z)).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F)); } @@ -91,7 +87,7 @@ public class ParticleHelper { * @return True to prevent vanilla break particles from spawning. */ @SideOnly(Side.CLIENT) - public static boolean addDestroyEffects(World world, Block block, IBlockState state, BlockPos pos, EffectRenderer effectRenderer, Callback callback) { + public static boolean addDestroyEffects(World world, Block block, IBlockState state, BlockPos pos, ParticleManager effectRenderer, Callback callback) { if (block != state.getBlock()) { return true; } @@ -103,9 +99,8 @@ public class ParticleHelper { double px = pos.getX() + (i + 0.5D) / iterations; double py = pos.getY() + (j + 0.5D) / iterations; double pz = pos.getZ() + (k + 0.5D) / iterations; - int random = rand.nextInt(6); - EntityDiggingFX fx = (EntityDiggingFX) effectRenderer.spawnEffectParticle(EnumParticleTypes.BLOCK_CRACK.getParticleID(), px, py, pz, px - pos.getX() - 0.5D, py - pos.getY() - 0.5D, pz - pos.getZ() - 0.5D, Block.getStateId(state)); + ParticleDigging fx = (ParticleDigging) effectRenderer.spawnEffectParticle(EnumParticleTypes.BLOCK_CRACK.getParticleID(), px, py, pz, px - pos.getX() - 0.5D, py - pos.getY() - 0.5D, pz - pos.getZ() - 0.5D, Block.getStateId(state)); callback.addDestroyEffects(fx, world, pos, state); effectRenderer.addEffect(fx.setBlockPos(pos)); } @@ -118,10 +113,10 @@ public class ParticleHelper { public interface Callback { @SideOnly(Side.CLIENT) - void addHitEffects(EntityDiggingFX fx, World world, BlockPos pos, IBlockState state); + void addHitEffects(ParticleDigging fx, World world, BlockPos pos, IBlockState state); @SideOnly(Side.CLIENT) - void addDestroyEffects(EntityDiggingFX fx, World world, BlockPos pos, IBlockState state); + void addDestroyEffects(ParticleDigging fx, World world, BlockPos pos, IBlockState state); } public static class DefaultCallback implements ParticleHelper.Callback { @@ -134,18 +129,18 @@ public class ParticleHelper { @Override @SideOnly(Side.CLIENT) - public void addHitEffects(EntityDiggingFX fx, World world, BlockPos pos, IBlockState state) { + public void addHitEffects(ParticleDigging fx, World world, BlockPos pos, IBlockState state) { setTexture(fx, world, pos, state); } @Override @SideOnly(Side.CLIENT) - public void addDestroyEffects(EntityDiggingFX fx, World world, BlockPos pos, IBlockState state) { + public void addDestroyEffects(ParticleDigging fx, World world, BlockPos pos, IBlockState state) { setTexture(fx, world, pos, state); } @SideOnly(Side.CLIENT) - protected void setTexture(EntityDiggingFX fx, World world, BlockPos pos, IBlockState state) { + protected void setTexture(ParticleDigging fx, World world, BlockPos pos, IBlockState state) { Minecraft minecraft = Proxies.common.getClientInstance(); BlockRendererDispatcher blockRendererDispatcher = minecraft.getBlockRendererDispatcher(); BlockModelShapes blockModelShapes = blockRendererDispatcher.getBlockModelShapes(); diff --git a/src/main/java/forestry/core/tiles/EscritoireGame.java b/src/main/java/forestry/core/tiles/EscritoireGame.java index 0fc1a0a7c..c4410a307 100644 --- a/src/main/java/forestry/core/tiles/EscritoireGame.java +++ b/src/main/java/forestry/core/tiles/EscritoireGame.java @@ -59,12 +59,13 @@ public class EscritoireGame implements INbtWritable, INbtReadable, IStreamable { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("bountyLevel", bountyLevel); nbttagcompound.setLong("lastUpdate", lastUpdate); gameBoard.writeToNBT(nbttagcompound); nbttagcompound.setInteger("Status", status.ordinal()); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/core/tiles/EscritoireGameBoard.java b/src/main/java/forestry/core/tiles/EscritoireGameBoard.java index a31acb14f..974445db5 100644 --- a/src/main/java/forestry/core/tiles/EscritoireGameBoard.java +++ b/src/main/java/forestry/core/tiles/EscritoireGameBoard.java @@ -190,7 +190,7 @@ public class EscritoireGameBoard implements INbtWritable, IStreamable { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { if (tokenCount > 0) { nbttagcompound.setInteger("TokenCount", tokenCount); NBTTagList nbttaglist = new NBTTagList(); @@ -211,6 +211,7 @@ public class EscritoireGameBoard implements INbtWritable, IStreamable { } else { nbttagcompound.setInteger("TokenCount", 0); } + return nbttagcompound; } /* IStreamable */ diff --git a/src/main/java/forestry/core/tiles/EscritoireGameToken.java b/src/main/java/forestry/core/tiles/EscritoireGameToken.java index 0356c2a11..bd8908fba 100644 --- a/src/main/java/forestry/core/tiles/EscritoireGameToken.java +++ b/src/main/java/forestry/core/tiles/EscritoireGameToken.java @@ -143,7 +143,7 @@ public class EscritoireGameToken implements INbtWritable, IStreamable { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("state", state.ordinal()); if (tokenStack != null) { @@ -151,6 +151,7 @@ public class EscritoireGameToken implements INbtWritable, IStreamable { tokenStack.writeToNBT(stackcompound); nbttagcompound.setTag("tokenStack", stackcompound); } + return nbttagcompound; } /* IStreamable */ diff --git a/src/main/java/forestry/core/tiles/TileAnalyzer.java b/src/main/java/forestry/core/tiles/TileAnalyzer.java index dcf00bf33..7042cb92b 100644 --- a/src/main/java/forestry/core/tiles/TileAnalyzer.java +++ b/src/main/java/forestry/core/tiles/TileAnalyzer.java @@ -71,10 +71,12 @@ public class TileAnalyzer extends TilePowered implements ISidedInventory, ILiqui } /* SAVING & LOADING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); tankManager.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/core/tiles/TileEngine.java b/src/main/java/forestry/core/tiles/TileEngine.java index 6a29fdbfd..6f20b49c6 100644 --- a/src/main/java/forestry/core/tiles/TileEngine.java +++ b/src/main/java/forestry/core/tiles/TileEngine.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.core.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -247,14 +248,16 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, forceCooldown = nbt.getBoolean("ForceCooldown"); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + nbt = super.writeToNBT(nbt); energyManager.writeToNBT(nbt); nbt.setInteger("EngineHeat", heat); nbt.setFloat("EngineProgress", progress); nbt.setBoolean("ForceCooldown", forceCooldown); + return nbt; } /* NETWORK */ @@ -281,7 +284,7 @@ public abstract class TileEngine extends TileBase implements IEnergyConnection, public abstract void getGUINetworkData(int i, int j); @Deprecated //use packets - public abstract void sendGUINetworkData(Container containerEngine, ICrafting iCrafting); + public abstract void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting); @Override public boolean canConnectEnergy(EnumFacing from) { diff --git a/src/main/java/forestry/core/tiles/TileEscritoire.java b/src/main/java/forestry/core/tiles/TileEscritoire.java index b59644708..c0e4fe9f8 100644 --- a/src/main/java/forestry/core/tiles/TileEscritoire.java +++ b/src/main/java/forestry/core/tiles/TileEscritoire.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -47,10 +48,12 @@ public class TileEscritoire extends TileBase implements ISidedInventory, ISlotPi game.readFromNBT(nbttagcompound); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); game.writeToNBT(nbttagcompound); + return nbttagcompound; } /* GAME */ diff --git a/src/main/java/forestry/core/tiles/TileForestry.java b/src/main/java/forestry/core/tiles/TileForestry.java index 15181a79d..9b446edc0 100644 --- a/src/main/java/forestry/core/tiles/TileForestry.java +++ b/src/main/java/forestry/core/tiles/TileForestry.java @@ -11,6 +11,7 @@ package forestry.core.tiles; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import java.util.Random; @@ -19,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; @@ -47,6 +48,7 @@ import forestry.core.network.DataOutputStreamForestry; import forestry.core.network.IStreamable; import forestry.core.network.packets.PacketTileStream; import forestry.core.proxy.Proxies; +import forestry.core.utils.NBTUtilForestry; //@Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") public abstract class TileForestry extends TileEntity implements IStreamable, IErrorLogicSource, ISidedInventory, IFilterSlotDelegate, IRestrictedAccess, ITitled, ILocatable, IGuiHandlerTile, ITickable { @@ -118,17 +120,32 @@ public abstract class TileForestry extends TileEntity implements IStreamable, IE accessHandler.readFromNBT(data); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound data) { - super.writeToNBT(data); + public NBTTagCompound writeToNBT(NBTTagCompound data) { + data = super.writeToNBT(data); inventory.writeToNBT(data); accessHandler.writeToNBT(data); + return data; + } + + @Nullable + @Override + public SPacketUpdateTileEntity getUpdatePacket() { + return new SPacketUpdateTileEntity(this.getPos(), 0, getUpdateTag()); + } + + @Nonnull + @Override + public NBTTagCompound getUpdateTag() { + NBTTagCompound tag = super.getUpdateTag(); + return NBTUtilForestry.writeStreamableToNbt(this, tag); } @Override - public Packet getDescriptionPacket() { - PacketTileStream packet = new PacketTileStream(this); - return packet.getPacket(); + public void handleUpdateTag(@Nonnull NBTTagCompound tag) { + super.handleUpdateTag(tag); + NBTUtilForestry.readStreamableFromNbt(this, tag); } /* INetworkedEntity */ diff --git a/src/main/java/forestry/core/tiles/TilePowered.java b/src/main/java/forestry/core/tiles/TilePowered.java index 8629cdbfa..6047ae45e 100644 --- a/src/main/java/forestry/core/tiles/TilePowered.java +++ b/src/main/java/forestry/core/tiles/TilePowered.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.nbt.NBTTagCompound; @@ -145,10 +146,12 @@ public abstract class TilePowered extends TileBase implements IRenderableTile, I return workCounter * i / ticksPerWorkCycle; } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + nbt = super.writeToNBT(nbt); energyManager.writeToNBT(nbt); + return nbt; } @Override diff --git a/src/main/java/forestry/core/utils/NBTUtilForestry.java b/src/main/java/forestry/core/utils/NBTUtilForestry.java index c75213aff..8017fe123 100644 --- a/src/main/java/forestry/core/utils/NBTUtilForestry.java +++ b/src/main/java/forestry/core/utils/NBTUtilForestry.java @@ -12,6 +12,7 @@ package forestry.core.utils; import com.google.common.collect.ForwardingList; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -31,6 +32,15 @@ import net.minecraft.nbt.NBTTagString; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.DataOutputStreamForestry; +import forestry.core.network.IStreamable; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufInputStream; +import io.netty.buffer.ByteBufOutputStream; +import io.netty.buffer.Unpooled; + /** * @author CovertJaguar */ @@ -89,4 +99,35 @@ public abstract class NBTUtilForestry { } } + + public static NBTTagCompound writeStreamableToNbt(IStreamable streamable, NBTTagCompound nbt) { + ByteBufOutputStream buf = new ByteBufOutputStream(Unpooled.buffer()); + DataOutputStreamForestry data = new DataOutputStreamForestry(buf); + try { + streamable.writeData(data); + } catch (IOException e) { + Log.error("Failed to write streamable data", e); + return nbt; + } + + ByteBuf buffer = buf.buffer(); + byte[] bytes = new byte[buffer.readableBytes()]; + buf.buffer().getBytes(0, bytes); + nbt.setByteArray("dataBytes", bytes); + return nbt; + } + + public static void readStreamableFromNbt(IStreamable streamable, NBTTagCompound nbt) { + if (nbt.hasKey("dataBytes")) { + byte[] bytes = nbt.getByteArray("dataBytes"); + ByteBufInputStream buf = new ByteBufInputStream(Unpooled.wrappedBuffer(bytes)); + DataInputStreamForestry data = new DataInputStreamForestry(buf); + try { + streamable.readData(data); + } catch (IOException e) { + Log.error("Failed to read streamable data", e); + } + } + } + } diff --git a/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java b/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java index 1ef1d4bb6..715a1a86e 100644 --- a/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java @@ -11,7 +11,7 @@ package forestry.energy.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotLiquidIn; @@ -37,7 +37,7 @@ public class ContainerEngineBiogas extends ContainerLiquidTanks { public void detectAndSendChanges() { super.detectAndSendChanges(); - for (ICrafting crafter : listeners) { + for (IContainerListener crafter : listeners) { tile.sendGUINetworkData(this, crafter); } } diff --git a/src/main/java/forestry/energy/gui/ContainerGenerator.java b/src/main/java/forestry/energy/gui/ContainerGenerator.java index 6632ee826..18e1e5eb7 100755 --- a/src/main/java/forestry/energy/gui/ContainerGenerator.java +++ b/src/main/java/forestry/energy/gui/ContainerGenerator.java @@ -11,7 +11,7 @@ package forestry.energy.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotLiquidIn; @@ -37,7 +37,7 @@ public class ContainerGenerator extends ContainerLiquidTanks { public void detectAndSendChanges() { super.detectAndSendChanges(); - for (ICrafting crafter : listeners) { + for (IContainerListener crafter : listeners) { tile.sendGUINetworkData(this, crafter); } } diff --git a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java index 8581a7a2a..2f8065baa 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java +++ b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java @@ -15,7 +15,7 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.ISidedInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -244,11 +244,13 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi tankManager.readFromNBT(nbt); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); + public NBTTagCompound writeToNBT(NBTTagCompound nbt) { + nbt = super.writeToNBT(nbt); nbt.setBoolean("shutdown", shutdown); tankManager.writeToNBT(nbt); + return nbt; } /* NETWORK */ @@ -286,7 +288,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi } @Override - public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) { + public void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting) { iCrafting.sendProgressBarUpdate(containerEngine, 0, currentOutput); iCrafting.sendProgressBarUpdate(containerEngine, 1, energyManager.toGuiInt()); iCrafting.sendProgressBarUpdate(containerEngine, 2, heat); diff --git a/src/main/java/forestry/energy/tiles/TileEngineClockwork.java b/src/main/java/forestry/energy/tiles/TileEngineClockwork.java index edb26152c..631081d7a 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineClockwork.java +++ b/src/main/java/forestry/energy/tiles/TileEngineClockwork.java @@ -10,10 +10,12 @@ ******************************************************************************/ package forestry.energy.tiles; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -77,10 +79,12 @@ public class TileEngineClockwork extends TileEngine { tension = nbttagcompound.getFloat("Wound"); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); nbttagcompound.setFloat("Wound", tension); + return nbttagcompound; } @Override @@ -157,7 +161,7 @@ public class TileEngineClockwork extends TileEngine { } @Override - public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) { + public void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting) { } @Override diff --git a/src/main/java/forestry/energy/tiles/TileEngineElectric.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java index 865bf4a5c..62826ee7f 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineElectric.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -10,11 +10,12 @@ ******************************************************************************/ package forestry.energy.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -85,14 +86,16 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve } } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); // if (ic2EnergySink != null) { // ic2EnergySink.writeToNBT(nbttagcompound); // } sockets.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override @@ -253,7 +256,7 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve } @Override - public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) { + public void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting) { // handled by IStreamableGui } diff --git a/src/main/java/forestry/energy/tiles/TileEnginePeat.java b/src/main/java/forestry/energy/tiles/TileEnginePeat.java index 01afa074c..973aa32a7 100644 --- a/src/main/java/forestry/energy/tiles/TileEnginePeat.java +++ b/src/main/java/forestry/energy/tiles/TileEnginePeat.java @@ -10,9 +10,11 @@ ******************************************************************************/ package forestry.energy.tiles; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; @@ -279,9 +281,10 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { } } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); if (fuelItem != null) { nbttagcompound.setString("EngineFuelItem", ItemStackUtil.getItemNameFromRegistryAsString(fuelItem)); @@ -291,6 +294,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { nbttagcompound.setInteger("EngineBurnTime", burnTime); nbttagcompound.setInteger("EngineTotalTime", totalBurnTime); nbttagcompound.setInteger("AshProduction", ashProduction); + return nbttagcompound; } // / SMP GUI @@ -317,7 +321,7 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { } @Override - public void sendGUINetworkData(Container containerEngine, ICrafting iCrafting) { + public void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting) { iCrafting.sendProgressBarUpdate(containerEngine, 0, burnTime); iCrafting.sendProgressBarUpdate(containerEngine, 1, totalBurnTime); iCrafting.sendProgressBarUpdate(containerEngine, 2, currentOutput); diff --git a/src/main/java/forestry/energy/tiles/TileEuGenerator.java b/src/main/java/forestry/energy/tiles/TileEuGenerator.java index 8d70f7ce3..d4f235c9c 100644 --- a/src/main/java/forestry/energy/tiles/TileEuGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileEuGenerator.java @@ -15,7 +15,7 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.ISidedInventory; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -66,15 +66,17 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui // } } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); // if (ic2EnergySource != null) { // ic2EnergySource.writeToNBT(nbttagcompound); // } tankManager.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override @@ -186,7 +188,7 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui } } - public void sendGUINetworkData(Container container, ICrafting iCrafting) { + public void sendGUINetworkData(Container container, IContainerListener iCrafting) { // if (ic2EnergySource != null) { // iCrafting.sendProgressBarUpdate(container, 0, (short) ic2EnergySource.getEnergyStored()); // } diff --git a/src/main/java/forestry/factory/gui/ContainerFabricator.java b/src/main/java/forestry/factory/gui/ContainerFabricator.java index 74d5ce4f1..e0c08c287 100755 --- a/src/main/java/forestry/factory/gui/ContainerFabricator.java +++ b/src/main/java/forestry/factory/gui/ContainerFabricator.java @@ -11,7 +11,7 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; @@ -69,7 +69,7 @@ public class ContainerFabricator extends ContainerLiquidTanks im public void detectAndSendChanges() { super.detectAndSendChanges(); - for (ICrafting crafter : listeners) { + for (IContainerListener crafter : listeners) { tile.sendGUINetworkData(this, crafter); } } diff --git a/src/main/java/forestry/factory/gui/ContainerFermenter.java b/src/main/java/forestry/factory/gui/ContainerFermenter.java index 5fcfb1c48..45dc4e9f8 100755 --- a/src/main/java/forestry/factory/gui/ContainerFermenter.java +++ b/src/main/java/forestry/factory/gui/ContainerFermenter.java @@ -11,7 +11,7 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotEmptyLiquidContainerIn; @@ -44,7 +44,7 @@ public class ContainerFermenter extends ContainerLiquidTanks { public void detectAndSendChanges() { super.detectAndSendChanges(); - for (ICrafting crafter : listeners) { + for (IContainerListener crafter : listeners) { tile.sendGUINetworkData(this, crafter); } } diff --git a/src/main/java/forestry/factory/gui/ContainerMoistener.java b/src/main/java/forestry/factory/gui/ContainerMoistener.java index 4f084ae43..2e9a65488 100755 --- a/src/main/java/forestry/factory/gui/ContainerMoistener.java +++ b/src/main/java/forestry/factory/gui/ContainerMoistener.java @@ -11,7 +11,7 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import forestry.core.gui.ContainerLiquidTanks; @@ -63,7 +63,7 @@ public class ContainerMoistener extends ContainerLiquidTanks impl public void detectAndSendChanges() { super.detectAndSendChanges(); - for (ICrafting crafter : listeners) { + for (IContainerListener crafter : listeners) { tile.sendGUINetworkData(this, crafter); } } diff --git a/src/main/java/forestry/factory/gui/ContainerRaintank.java b/src/main/java/forestry/factory/gui/ContainerRaintank.java index 5e3153ebc..343529eb9 100755 --- a/src/main/java/forestry/factory/gui/ContainerRaintank.java +++ b/src/main/java/forestry/factory/gui/ContainerRaintank.java @@ -11,7 +11,7 @@ package forestry.factory.gui; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotEmptyLiquidContainerIn; @@ -39,7 +39,7 @@ public class ContainerRaintank extends ContainerLiquidTanks { public void detectAndSendChanges() { super.detectAndSendChanges(); - for (ICrafting crafter : listeners) { + for (IContainerListener crafter : listeners) { tile.sendGUINetworkData(this, crafter); } } diff --git a/src/main/java/forestry/factory/recipes/MemorizedRecipe.java b/src/main/java/forestry/factory/recipes/MemorizedRecipe.java index 09bf87699..9bd0438c1 100644 --- a/src/main/java/forestry/factory/recipes/MemorizedRecipe.java +++ b/src/main/java/forestry/factory/recipes/MemorizedRecipe.java @@ -126,11 +126,12 @@ public final class MemorizedRecipe implements INbtWritable, INbtReadable, IStrea } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { InventoryUtil.writeToNBT(craftMatrix, nbttagcompound); nbttagcompound.setLong("LastUsed", lastUsed); nbttagcompound.setBoolean("Locked", locked); nbttagcompound.setInteger("SelectedRecipe", selectedRecipe); + return nbttagcompound; } /* IStreamable */ diff --git a/src/main/java/forestry/factory/recipes/RecipeMemory.java b/src/main/java/forestry/factory/recipes/RecipeMemory.java index 80a276a4c..71358c354 100644 --- a/src/main/java/forestry/factory/recipes/RecipeMemory.java +++ b/src/main/java/forestry/factory/recipes/RecipeMemory.java @@ -184,7 +184,7 @@ public class RecipeMemory implements INbtWritable, IStreamable { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { NBTTagList nbttaglist = new NBTTagList(); for (MemorizedRecipe recipe : memorizedRecipes) { if (recipe != null) { @@ -194,6 +194,7 @@ public class RecipeMemory implements INbtWritable, IStreamable { } } nbttagcompound.setTag("RecipeMemory", nbttaglist); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/factory/tiles/TileBottler.java b/src/main/java/forestry/factory/tiles/TileBottler.java index 3cb7051d9..5d624df43 100644 --- a/src/main/java/forestry/factory/tiles/TileBottler.java +++ b/src/main/java/forestry/factory/tiles/TileBottler.java @@ -60,10 +60,12 @@ public class TileBottler extends TilePowered implements ISidedInventory, ILiquid } /* SAVING & LOADING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); tankManager.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/factory/tiles/TileCarpenter.java b/src/main/java/forestry/factory/tiles/TileCarpenter.java index 8e41c84a2..f270399e9 100644 --- a/src/main/java/forestry/factory/tiles/TileCarpenter.java +++ b/src/main/java/forestry/factory/tiles/TileCarpenter.java @@ -80,12 +80,14 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu } /* LOADING & SAVING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); tankManager.writeToNBT(nbttagcompound); craftingInventory.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/factory/tiles/TileCentrifuge.java b/src/main/java/forestry/factory/tiles/TileCentrifuge.java index 1269bf9cb..94927e1c0 100644 --- a/src/main/java/forestry/factory/tiles/TileCentrifuge.java +++ b/src/main/java/forestry/factory/tiles/TileCentrifuge.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.factory.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import java.util.Collection; import java.util.Stack; @@ -57,9 +58,10 @@ public class TileCentrifuge extends TilePowered implements ISocketable, ISidedIn } /* LOADING & SAVING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); sockets.writeToNBT(nbttagcompound); @@ -74,6 +76,7 @@ public class TileCentrifuge extends TilePowered implements ISocketable, ISidedIn } } nbttagcompound.setTag("PendingProducts", nbttaglist); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index 3043b4440..844d8fe8f 100644 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -15,7 +15,7 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; @@ -75,13 +75,15 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I } /* SAVING & LOADING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); nbttagcompound.setInteger("Heat", heat); tankManager.writeToNBT(nbttagcompound); craftingInventory.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override @@ -296,7 +298,7 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I } } - public void sendGUINetworkData(Container container, ICrafting iCrafting) { + public void sendGUINetworkData(Container container, IContainerListener iCrafting) { iCrafting.sendProgressBarUpdate(container, 0, heat); iCrafting.sendProgressBarUpdate(container, 1, getMeltingPoint()); } diff --git a/src/main/java/forestry/factory/tiles/TileFermenter.java b/src/main/java/forestry/factory/tiles/TileFermenter.java index d0c44d50f..06c67d61a 100644 --- a/src/main/java/forestry/factory/tiles/TileFermenter.java +++ b/src/main/java/forestry/factory/tiles/TileFermenter.java @@ -15,7 +15,7 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -71,9 +71,10 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu tankManager = new TankManager(this, resourceTank, productTank); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); nbttagcompound.setInteger("FermentationTime", fermentationTime); nbttagcompound.setInteger("FermentationTotalTime", fermentationTotalTime); @@ -82,6 +83,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu nbttagcompound.setInteger("FuelCurrentFerment", fuelCurrentFerment); tankManager.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override @@ -282,7 +284,7 @@ public class TileFermenter extends TilePowered implements ISidedInventory, ILiqu } } - public void sendGUINetworkData(Container container, ICrafting iCrafting) { + public void sendGUINetworkData(Container container, IContainerListener iCrafting) { iCrafting.sendProgressBarUpdate(container, 0, fuelBurnTime); iCrafting.sendProgressBarUpdate(container, 1, fuelTotalTime); iCrafting.sendProgressBarUpdate(container, 2, fermentationTime); diff --git a/src/main/java/forestry/factory/tiles/TileMillRainmaker.java b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java index 685bbbac5..cb199d034 100644 --- a/src/main/java/forestry/factory/tiles/TileMillRainmaker.java +++ b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.factory.tiles; +import javax.annotation.Nonnull; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -64,15 +66,17 @@ public class TileMillRainmaker extends TileMill { reverse = nbttagcompound.getBoolean("Reverse"); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); nbttagcompound.setInteger("Charge", charge); nbttagcompound.setFloat("Progress", progress); nbttagcompound.setInteger("Stage", stage); nbttagcompound.setInteger("Duration", duration); nbttagcompound.setBoolean("Reverse", reverse); + return nbttagcompound; } public void addCharge(RainSubstrate substrate) { diff --git a/src/main/java/forestry/factory/tiles/TileMoistener.java b/src/main/java/forestry/factory/tiles/TileMoistener.java index 35df1e2ca..b9c8a6aa5 100644 --- a/src/main/java/forestry/factory/tiles/TileMoistener.java +++ b/src/main/java/forestry/factory/tiles/TileMoistener.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -71,9 +71,10 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT } /* LOADING & SAVING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); nbttagcompound.setInteger("BurnTime", burnTime); nbttagcompound.setInteger("TotalTime", totalTime); @@ -92,6 +93,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT currentProduct.writeToNBT(nbttagcompoundP); nbttagcompound.setTag("CurrentProduct", nbttagcompoundP); } + return nbttagcompound; } @Override @@ -533,7 +535,7 @@ public class TileMoistener extends TileBase implements ISidedInventory, ILiquidT } } - public void sendGUINetworkData(Container container, ICrafting iCrafting) { + public void sendGUINetworkData(Container container, IContainerListener iCrafting) { iCrafting.sendProgressBarUpdate(container, 0, burnTime); iCrafting.sendProgressBarUpdate(container, 1, totalTime); iCrafting.sendProgressBarUpdate(container, 2, productionTime); diff --git a/src/main/java/forestry/factory/tiles/TileRaintank.java b/src/main/java/forestry/factory/tiles/TileRaintank.java index 8dff65eec..e249e7e65 100644 --- a/src/main/java/forestry/factory/tiles/TileRaintank.java +++ b/src/main/java/forestry/factory/tiles/TileRaintank.java @@ -15,13 +15,13 @@ import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -61,10 +61,12 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa tankManager = new TankManager(this, resourceTank); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); tankManager.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override @@ -94,7 +96,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa IErrorLogic errorLogic = getErrorLogic(); - BiomeGenBase biome = worldObj.getBiomeGenForCoordsBody(getPos()); + Biome biome = worldObj.getBiome(getPos()); errorLogic.setCondition(!biome.canRain(), EnumErrorCode.NO_RAIN_BIOME); BlockPos posAbove = getPos().up(); @@ -149,7 +151,7 @@ public class TileRaintank extends TileBase implements ISidedInventory, ILiquidTa } } - public void sendGUINetworkData(Container container, ICrafting iCrafting) { + public void sendGUINetworkData(Container container, IContainerListener iCrafting) { iCrafting.sendProgressBarUpdate(container, 0, fillingTime); } diff --git a/src/main/java/forestry/factory/tiles/TileSqueezer.java b/src/main/java/forestry/factory/tiles/TileSqueezer.java index 39fd040d6..5e5757202 100644 --- a/src/main/java/forestry/factory/tiles/TileSqueezer.java +++ b/src/main/java/forestry/factory/tiles/TileSqueezer.java @@ -72,11 +72,13 @@ public class TileSqueezer extends TilePowered implements ISocketable, ISidedInve } /* LOADING & SAVING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); tankManager.writeToNBT(nbttagcompound); sockets.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/factory/tiles/TileStill.java b/src/main/java/forestry/factory/tiles/TileStill.java index 9f07426fa..119b0ff2a 100644 --- a/src/main/java/forestry/factory/tiles/TileStill.java +++ b/src/main/java/forestry/factory/tiles/TileStill.java @@ -61,9 +61,10 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa tankManager = new TankManager(this, resourceTank, productTank); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); tankManager.writeToNBT(nbttagcompound); if (bufferedLiquid != null) { @@ -71,7 +72,7 @@ public class TileStill extends TilePowered implements ISidedInventory, ILiquidTa bufferedLiquid.writeToNBT(buffer); nbttagcompound.setTag("Buffer", buffer); } - + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/factory/tiles/TileWorktable.java b/src/main/java/forestry/factory/tiles/TileWorktable.java index c399b28a4..cf278c169 100644 --- a/src/main/java/forestry/factory/tiles/TileWorktable.java +++ b/src/main/java/forestry/factory/tiles/TileWorktable.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.factory.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -19,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeHooks; + import forestry.core.inventory.InventoryAdapterTile; import forestry.core.inventory.wrappers.InventoryMapper; import forestry.core.network.DataInputStreamForestry; @@ -49,12 +51,14 @@ public class TileWorktable extends TileBase implements ICrafterWorktable { } /* LOADING & SAVING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); craftingDisplay.writeToNBT(nbttagcompound); recipeMemory.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/farming/FarmHelper.java b/src/main/java/forestry/farming/FarmHelper.java index f898cccb6..c73df8d4f 100755 --- a/src/main/java/forestry/farming/FarmHelper.java +++ b/src/main/java/forestry/farming/FarmHelper.java @@ -46,11 +46,11 @@ public class FarmHelper { BlockPos.MutableBlockPos edge = new BlockPos.MutableBlockPos(start); while (world.getTileEntity(edge) instanceof IFarmComponent) { - edge.offsetMutable(direction.getFacing()); + edge.move(direction.getFacing()); } FarmDirection oppositeDirection = getOpposite(direction); - edge.offsetMutable(oppositeDirection.getFacing()); + edge.move(oppositeDirection.getFacing()); return edge.toImmutable(); } diff --git a/src/main/java/forestry/farming/FarmTarget.java b/src/main/java/forestry/farming/FarmTarget.java index 97f002d0f..f102c1fc0 100755 --- a/src/main/java/forestry/farming/FarmTarget.java +++ b/src/main/java/forestry/farming/FarmTarget.java @@ -59,7 +59,7 @@ public class FarmTarget { if (!FarmHelper.bricks.contains(blockState.getBlock())) { break; } - position.offsetMutable(getDirection().getFacing()); + position.move(getDirection().getFacing()); } yOffset = platformPosition.getY() + 1 - getStart().getY(); diff --git a/src/main/java/forestry/farming/PluginFarming.java b/src/main/java/forestry/farming/PluginFarming.java index f9f85e09f..e3c4e6a63 100644 --- a/src/main/java/forestry/farming/PluginFarming.java +++ b/src/main/java/forestry/farming/PluginFarming.java @@ -14,10 +14,8 @@ import java.util.Arrays; import java.util.List; import net.minecraft.block.BlockBeetroot; -import net.minecraft.block.BlockCarrot; import net.minecraft.block.BlockCrops; import net.minecraft.block.BlockNetherWart; -import net.minecraft.block.BlockPotato; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java index fa9bf406e..6e78abbdd 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicCocoa.java +++ b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java @@ -144,7 +144,7 @@ public class FarmLogicCocoa extends FarmLogic { } } - current.offsetMutable(EnumFacing.UP); + current.move(EnumFacing.UP); if (current.getY() - position.getY() > 1) { break; } diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 825d441be..a8e544748 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -36,7 +36,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -141,7 +141,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen // tick updates can come from multiple gearboxes so keep track of them here private int farmWorkTicks = 0; - private BiomeGenBase cachedBiome; + private Biome cachedBiome; public FarmController(World world) { super(world, FarmMultiblockSizeLimits.instance); @@ -178,10 +178,10 @@ public class FarmController extends RectangularMultiblockControllerBase implemen return tankManager; } - private BiomeGenBase getBiome() { + private Biome getBiome() { if (cachedBiome == null) { BlockPos coords = getReferenceCoord(); - cachedBiome = worldObj.getBiomeGenForCoords(coords); + cachedBiome = worldObj.getBiome(coords); } return cachedBiome; } @@ -306,13 +306,14 @@ public class FarmController extends RectangularMultiblockControllerBase implemen } @Override - public void writeToNBT(NBTTagCompound data) { - super.writeToNBT(data); + public NBTTagCompound writeToNBT(NBTTagCompound data) { + data = super.writeToNBT(data); sockets.writeToNBT(data); hydrationManager.writeToNBT(data); tankManager.writeToNBT(data); fertilizerManager.writeToNBT(data); inventory.writeToNBT(data); + return data; } @Override diff --git a/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java b/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java index df819e8cd..2c65b7111 100644 --- a/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java +++ b/src/main/java/forestry/farming/multiblock/FarmFertilizerManager.java @@ -68,8 +68,9 @@ public class FarmFertilizerManager implements INbtWritable, INbtReadable, IStrea } @Override - public void writeToNBT(NBTTagCompound data) { + public NBTTagCompound writeToNBT(NBTTagCompound data) { data.setInteger("StoredFertilizer", storedFertilizer); + return data; } public int getStoredFertilizerScaled(int scale) { diff --git a/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java b/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java index df841a5de..ea1d8ec7a 100644 --- a/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java +++ b/src/main/java/forestry/farming/multiblock/FarmHydrationManager.java @@ -89,9 +89,10 @@ public class FarmHydrationManager implements IFarmLedgerDelegate, INbtWritable, } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setInteger("HydrationDelay", hydrationDelay); nbttagcompound.setInteger("TicksSinceRainfall", ticksSinceRainfall); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/farming/tiles/TileFarm.java b/src/main/java/forestry/farming/tiles/TileFarm.java index c2a625d20..53067a1e1 100644 --- a/src/main/java/forestry/farming/tiles/TileFarm.java +++ b/src/main/java/forestry/farming/tiles/TileFarm.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.farming.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import java.util.List; @@ -19,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; + import forestry.api.circuits.ICircuitSocketType; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorLogicSource; @@ -79,10 +81,12 @@ public abstract class TileFarm extends MultiblockTileEntityForestry 0); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); nbttagcompound.setInteger("Heating", workingTime); + return nbttagcompound; } /* Network */ diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java index 1f733407f..1e48822d1 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseHatch.java @@ -106,10 +106,10 @@ public class TileGreenhouseHatch extends MultiblockTileEntityBase T getCapability(Capability capability, EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getOutwardsTile() != null) { return getOutwardsTile().getCapability(capability, facing); } @@ -305,7 +308,7 @@ public class TileGreenhouseHatch extends MultiblockTileEntityBase capability, EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nonnull EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getOutwardsTile() != null) { return getOutwardsTile().hasCapability(capability, facing); } diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java index a21b711f4..501d819e1 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockCocoon.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.lepidopterology.blocks; +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List; import java.util.Random; @@ -57,6 +58,7 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap setDefaultState(this.blockState.getBaseState().withProperty(COCOON, AlleleButterflyCocoon.cocoonDefault).withProperty(AlleleButterflyCocoon.AGE, 0)); } + @Nonnull @Override protected BlockStateContainer createBlockState() { return new BlockStateContainer(this, COCOON, AlleleButterflyCocoon.AGE); @@ -64,7 +66,7 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap @SideOnly(Side.CLIENT) @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { TileCocoon cocoon = TileUtil.getTile(world, pos, TileCocoon.class); if(cocoon != null){ state = state.withProperty(COCOON, cocoon.getCaterpillar().getGenome().getCocoon()).withProperty(AlleleButterflyCocoon.AGE, cocoon.getAge()); @@ -121,13 +123,12 @@ public class BlockCocoon extends Block implements ITileEntityProvider, IStateMap public int getMetaFromState(IBlockState state){ return 0; } - - @Override - public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) { - IBlockState stateUp = worldIn.getBlockState(pos.up()); - if(stateUp.getBlock().isAir(stateUp, worldIn, pos.up())){ - worldIn.setBlockToAir(pos); - } + + @Override + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { + if (worldIn.isAirBlock(pos.up())) { + worldIn.setBlockToAir(pos); + } } @Override diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java b/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java index 0551818ea..44a3762db 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockSolidCocoon.java @@ -121,12 +121,11 @@ public class BlockSolidCocoon extends Block implements ITileEntityProvider, ISta public int getMetaFromState(IBlockState state){ return 0; } - - @Override - public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock) { - IBlockState stateUp = worldIn.getBlockState(pos.up()); - if(stateUp.getBlock().isAir(stateUp, worldIn, pos.up())){ - worldIn.setBlockToAir(pos); + + @Override + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { + if (worldIn.isAirBlock(pos.up())) { + worldIn.setBlockToAir(pos); } } diff --git a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java index 0f17a1938..796265935 100755 --- a/src/main/java/forestry/lepidopterology/genetics/Butterfly.java +++ b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java @@ -24,7 +24,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; @@ -135,7 +135,7 @@ public class Butterfly extends IndividualLiving implements IButterfly { return false; } - BiomeGenBase biome = world.getBiomeGenForCoordsBody(new BlockPos(x, 0, z)); + Biome biome = world.getBiome(new BlockPos(x, 0, z)); if (!getGenome().getPrimary().getSpawnBiomes().isEmpty()) { boolean noneMatched = true; @@ -182,7 +182,7 @@ public class Butterfly extends IndividualLiving implements IButterfly { } private boolean isAcceptedEnvironment(World world, int x, int y, int z) { - BiomeGenBase biome = world.getBiomeGenForCoords(new BlockPos(x, y, z)); + Biome biome = world.getBiome(new BlockPos(x, y, z)); EnumTemperature biomeTemperature = EnumTemperature.getFromBiome(biome, world, new BlockPos(x, y, z)); EnumHumidity biomeHumidity = EnumHumidity.getFromValue(ForestryAPI.climateManager.getHumidity(world, new BlockPos(x, y, z))); return AlleleManager.climateHelper.isWithinLimits(biomeTemperature, biomeHumidity, diff --git a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java index a6ae6a053..2d8aa4b4e 100644 --- a/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java +++ b/src/main/java/forestry/lepidopterology/tiles/TileCocoon.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.lepidopterology.tiles; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.io.IOException; import net.minecraft.block.Block; @@ -17,7 +19,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -39,6 +41,7 @@ import forestry.core.network.packets.PacketTileStream; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; +import forestry.core.utils.NBTUtilForestry; import forestry.core.utils.PlayerUtil; import forestry.greenhouse.multiblock.GreenhouseController; import forestry.lepidopterology.genetics.Butterfly; @@ -85,9 +88,10 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IBu isSolid = nbttagcompound.getBoolean("isSolid"); } + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); if (caterpillar != null) { NBTTagCompound subcompound = new NBTTagCompound(); @@ -110,6 +114,7 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IBu nbttagcompound.setInteger("Age", age); nbttagcompound.setInteger("CATMAT", maturationTime); nbttagcompound.setBoolean("isSolid", isSolid); + return nbttagcompound; } @Override @@ -166,9 +171,23 @@ public class TileCocoon extends TileEntity implements IStreamable, IOwnable, IBu } /* INETWORKEDENTITY */ + @Nullable @Override - public Packet getDescriptionPacket() { - return new PacketTileStream(this).getPacket(); + public SPacketUpdateTileEntity getUpdatePacket() { + return new SPacketUpdateTileEntity(this.getPos(), 0, getUpdateTag()); + } + + @Nonnull + @Override + public NBTTagCompound getUpdateTag() { + NBTTagCompound tag = super.getUpdateTag(); + return NBTUtilForestry.writeStreamableToNbt(this, tag); + } + + @Override + public void handleUpdateTag(@Nonnull NBTTagCompound tag) { + super.handleUpdateTag(tag); + NBTUtilForestry.readStreamableFromNbt(this, tag); } public void onBlockTick() { diff --git a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java index 9010b57f0..0d7527d12 100644 --- a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java +++ b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java @@ -20,7 +20,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraftforge.common.BiomeDictionary; @@ -67,7 +67,7 @@ public abstract class CocoonDecorator { int worldX = chunkX * 16; int worldZ = chunkZ * 16; - BiomeGenBase biome = world.getBiomeGenForCoords(new BlockPos(worldX, 0, worldZ)); + Biome biome = world.getBiome(new BlockPos(worldX, 0, worldZ)); Type[] types = BiomeDictionary.getTypesForBiome(biome); EnumSet speciesTypes = butterfly.getGenome().getPrimary().getSpawnBiomes(); diff --git a/src/main/java/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java index 8969ee901..0fe91141b 100755 --- a/src/main/java/forestry/mail/Letter.java +++ b/src/main/java/forestry/mail/Letter.java @@ -66,7 +66,7 @@ public class Letter implements ILetter { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setBoolean("PRC", isProcessed); @@ -84,6 +84,7 @@ public class Letter implements ILetter { nbttagcompound.setString("TXT", this.text); nbttagcompound.setString("UID", this.uid); inventory.writeToNBT(nbttagcompound); + return nbttagcompound; } @Override diff --git a/src/main/java/forestry/mail/MailAddress.java b/src/main/java/forestry/mail/MailAddress.java index 4e915d21b..5f30d1e48 100644 --- a/src/main/java/forestry/mail/MailAddress.java +++ b/src/main/java/forestry/mail/MailAddress.java @@ -135,7 +135,7 @@ public class MailAddress implements INbtWritable, IMailAddress { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { nbttagcompound.setString("TP", type.toString()); if (gameProfile != null) { @@ -143,5 +143,6 @@ public class MailAddress implements INbtWritable, IMailAddress { PlayerUtil.writeGameProfile(profileNbt, gameProfile); nbttagcompound.setTag("profile", profileNbt); } + return nbttagcompound; } } diff --git a/src/main/java/forestry/mail/POBox.java b/src/main/java/forestry/mail/POBox.java index 1d99d04ab..121bf7b0a 100755 --- a/src/main/java/forestry/mail/POBox.java +++ b/src/main/java/forestry/mail/POBox.java @@ -52,13 +52,14 @@ public class POBox extends WorldSavedData implements IInventory { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { if (this.address != null) { NBTTagCompound nbt = new NBTTagCompound(); this.address.writeToNBT(nbt); nbttagcompound.setTag("address", nbt); } letters.writeToNBT(nbttagcompound); + return nbttagcompound; } public boolean storeLetter(ItemStack letterstack) { diff --git a/src/main/java/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java index 4fc83c57e..20471c1af 100755 --- a/src/main/java/forestry/mail/PostOffice.java +++ b/src/main/java/forestry/mail/PostOffice.java @@ -58,10 +58,11 @@ public class PostOffice extends WorldSavedData implements IPostOffice { } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { for (int i = 0; i < collectedPostage.length; i++) { nbttagcompound.setInteger("CPS" + i, collectedPostage[i]); } + return nbttagcompound; } /* TRADE STATION MANAGMENT */ diff --git a/src/main/java/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java index b28b885c7..cbf891639 100755 --- a/src/main/java/forestry/mail/TradeStation.java +++ b/src/main/java/forestry/mail/TradeStation.java @@ -98,7 +98,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve } @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { if (owner != null) { NBTTagCompound nbt = new NBTTagCompound(); PlayerUtil.writeGameProfile(nbt, owner); @@ -114,6 +114,7 @@ public class TradeStation extends WorldSavedData implements ITradeStation, IInve nbttagcompound.setBoolean("VRT", this.isVirtual); nbttagcompound.setBoolean("IVL", this.isInvalid); inventory.writeToNBT(nbttagcompound); + return nbttagcompound; } /* INVALIDATING */ diff --git a/src/main/java/forestry/mail/gui/ContainerCatalogue.java b/src/main/java/forestry/mail/gui/ContainerCatalogue.java index 59e5d939d..0ce4d0268 100755 --- a/src/main/java/forestry/mail/gui/ContainerCatalogue.java +++ b/src/main/java/forestry/mail/gui/ContainerCatalogue.java @@ -20,7 +20,7 @@ import java.util.Set; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IContainerListener; import forestry.api.mail.EnumAddressee; import forestry.api.mail.EnumTradeStationState; @@ -179,7 +179,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe super.detectAndSendChanges(); if (needsSynch) { - for (ICrafting crafter : listeners) { + for (IContainerListener crafter : listeners) { crafter.sendProgressBarUpdate(this, 0, stationIndex); crafter.sendProgressBarUpdate(this, 1, stations.size()); crafter.sendProgressBarUpdate(this, 2, currentFilter); diff --git a/src/main/java/forestry/mail/tiles/TileTrader.java b/src/main/java/forestry/mail/tiles/TileTrader.java index dd8e001a1..516fb947f 100644 --- a/src/main/java/forestry/mail/tiles/TileTrader.java +++ b/src/main/java/forestry/mail/tiles/TileTrader.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.mail.tiles; +import javax.annotation.Nonnull; import java.io.IOException; import net.minecraft.entity.player.EntityPlayer; @@ -63,15 +64,17 @@ public class TileTrader extends TileBase { } /* SAVING & LOADING */ + @Nonnull @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); + public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound) { + nbttagcompound = super.writeToNBT(nbttagcompound); if (address != null) { NBTTagCompound nbt = new NBTTagCompound(); address.writeToNBT(nbt); nbttagcompound.setTag("address", nbt); } + return nbttagcompound; } @Override diff --git a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/plum.json b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/plum.json index 1a38a786f..faa7b4250 100644 --- a/src/main/resources/assets/forestry/blockstates/arboriculture/slab/plum.json +++ b/src/main/resources/assets/forestry/blockstates/arboriculture/slab/plum.json @@ -1,6 +1,5 @@ { "variants": { - //plum "half=bottom": { "model": "forestry:arboriculture/slab/plum_half" }, "half=top": { "model": "forestry:arboriculture/slab/plum_upper" } }