From 0ebced96090b3129ef6e38952223dc22e824a7a2 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 7 Sep 2017 19:23:59 -0700 Subject: [PATCH] Fix #1845 API has references to internal classes --- gradle.properties | 2 +- .../forestry/api/apiculture/IBeekeepingLogic.java | 11 ++++------- .../java/forestry/apiculture/BeekeepingLogic.java | 7 +++---- .../java/forestry/apiculture/HasFlowersCache.java | 11 ++++------- .../forestry/apiculture/WorldgenBeekeepingLogic.java | 6 +++--- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index d6c820eff..73787c2d9 100755 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ ic2_version=2.8.24-ex112 version_major=5 version_minor=5 -version_patch=2 +version_patch=3 diff --git a/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java b/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java index d6fc44ac2..b8cf860f8 100644 --- a/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java +++ b/src/main/java/forestry/api/apiculture/IBeekeepingLogic.java @@ -10,10 +10,9 @@ import java.util.List; import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; -import forestry.core.network.IStreamable; -import forestry.core.network.PacketBufferForestry; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; @@ -24,7 +23,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; * Get one with BeeManager.beeRoot.createBeekeepingLogic(IBeeHousing housing) * Save and load it to NBT using the INbtWritable methods. */ -public interface IBeekeepingLogic extends INbtWritable, INbtReadable, IStreamable { +public interface IBeekeepingLogic extends INbtWritable, INbtReadable { /* SERVER */ @@ -83,13 +82,11 @@ public interface IBeekeepingLogic extends INbtWritable, INbtReadable, IStreamabl */ List getFlowerPositions(); - @Override - default void readData(PacketBufferForestry data) throws IOException { + default void readData(PacketBuffer data) throws IOException { } - @Override - default void writeData(PacketBufferForestry data) { + default void writeData(PacketBuffer data) { } } diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index f0159f085..fbbc42004 100644 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -38,8 +38,6 @@ import forestry.apiculture.network.packets.PacketBeeLogicActive; import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; -import forestry.core.network.IStreamable; -import forestry.core.network.PacketBufferForestry; import forestry.core.utils.Log; import forestry.core.utils.NetworkUtil; import net.minecraft.client.Minecraft; @@ -48,6 +46,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -136,7 +135,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { } @Override - public void writeData(PacketBufferForestry data) { + public void writeData(PacketBuffer data) { data.writeBoolean(active); if (active) { data.writeItemStack(queenStack); @@ -145,7 +144,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { } @Override - public void readData(PacketBufferForestry data) throws IOException { + public void readData(PacketBuffer data) throws IOException { boolean active = data.readBoolean(); setActive(active); if (active) { diff --git a/src/main/java/forestry/apiculture/HasFlowersCache.java b/src/main/java/forestry/apiculture/HasFlowersCache.java index 4d6ba8b90..79cf12076 100644 --- a/src/main/java/forestry/apiculture/HasFlowersCache.java +++ b/src/main/java/forestry/apiculture/HasFlowersCache.java @@ -24,14 +24,13 @@ import forestry.api.core.INbtReadable; import forestry.api.core.INbtWritable; import forestry.api.core.IBlockPosPredicate; import forestry.api.genetics.IFlowerProvider; -import forestry.core.network.IStreamable; -import forestry.core.network.PacketBufferForestry; import forestry.core.utils.TickHelper; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class HasFlowersCache implements INbtWritable, INbtReadable, IStreamable { +public class HasFlowersCache implements INbtWritable, INbtReadable { private static final String NBT_KEY = "hasFlowerCache"; private static final String NBT_KEY_FLOWERS = "flowers"; private static final int FLOWER_CHECK_INTERVAL = 200; @@ -157,8 +156,7 @@ public class HasFlowersCache implements INbtWritable, INbtReadable, IStreamable return nbttagcompound; } - @Override - public void writeData(PacketBufferForestry data) { + public void writeData(PacketBuffer data) { int size = flowerCoords.size(); data.writeVarInt(size); if (size > 0) { @@ -170,8 +168,7 @@ public class HasFlowersCache implements INbtWritable, INbtReadable, IStreamable } } - @Override - public void readData(PacketBufferForestry data) throws IOException { + public void readData(PacketBuffer data) throws IOException { flowerCoords.clear(); int size = data.readVarInt(); diff --git a/src/main/java/forestry/apiculture/WorldgenBeekeepingLogic.java b/src/main/java/forestry/apiculture/WorldgenBeekeepingLogic.java index dd3aa47e3..d1cd74d65 100644 --- a/src/main/java/forestry/apiculture/WorldgenBeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/WorldgenBeekeepingLogic.java @@ -18,12 +18,12 @@ import forestry.api.apiculture.IBeekeepingLogic; import forestry.api.genetics.IEffectData; import forestry.apiculture.network.packets.PacketBeeLogicActive; import forestry.apiculture.tiles.TileHive; -import forestry.core.network.PacketBufferForestry; import forestry.core.utils.NetworkUtil; import forestry.core.utils.TickHelper; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -58,7 +58,7 @@ public class WorldgenBeekeepingLogic implements IBeekeepingLogic { } @Override - public void writeData(PacketBufferForestry data) { + public void writeData(PacketBuffer data) { data.writeBoolean(active); if (active) { hasFlowersCache.writeData(data); @@ -66,7 +66,7 @@ public class WorldgenBeekeepingLogic implements IBeekeepingLogic { } @Override - public void readData(PacketBufferForestry data) throws IOException { + public void readData(PacketBuffer data) throws IOException { boolean active = data.readBoolean(); setActive(active); if (active) {