diff --git a/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java index 9e438dbf..bdc5f473 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourDisplay.java @@ -8,6 +8,8 @@ import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.renderer.RenderUtil; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlColourDisplay extends Control implements IControlValue, ITooltip { private IFlowerColour value; @@ -29,6 +31,7 @@ public class ControlColourDisplay extends Control implements IControlValue transformMap = new EnumMap<>(ItemCameraTransforms.TransformType.class); private final ResourceLocation particle; diff --git a/src/main/java/binnie/core/gui/BinnieGUIHandler.java b/src/main/java/binnie/core/gui/BinnieGUIHandler.java index fe256973..7bdca2e1 100644 --- a/src/main/java/binnie/core/gui/BinnieGUIHandler.java +++ b/src/main/java/binnie/core/gui/BinnieGUIHandler.java @@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -30,6 +31,7 @@ public final class BinnieGUIHandler implements IGuiHandler { @Override @Nullable + @SideOnly(Side.CLIENT) public final Object getClientGuiElement(final int id, final EntityPlayer player, final World world, final int x, final int y, final int z) { if (BinnieCore.getBinnieProxy().isSimulating(world)) { return this.getServerGuiElement(id, player, world, x, y, z); diff --git a/src/main/java/binnie/core/machines/Machine.java b/src/main/java/binnie/core/machines/Machine.java index c721164f..e03252c2 100644 --- a/src/main/java/binnie/core/machines/Machine.java +++ b/src/main/java/binnie/core/machines/Machine.java @@ -164,6 +164,7 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN component.onUpdate(); } } else { + //noinspection MethodCallSideOnly updateClient(); } if (this.queuedInventoryUpdate) { @@ -293,16 +294,24 @@ public class Machine implements INetworkedEntity, INbtReadable, INbtWritable, IN } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { - for (final INetwork.RecieveGuiNBT recieve : this.getInterfaces(INetwork.RecieveGuiNBT.class)) { - recieve.recieveGuiNBT(side, player, name, nbt); + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + for (final INetwork.ReceiveGuiNBT receive : this.getInterfaces(INetwork.ReceiveGuiNBT.class)) { + receive.receiveGuiNBTOnServer(player, name, nbt); } } @Override - public void sendGuiNBT(final Map nbt) { - for (final INetwork.SendGuiNBT recieve : this.getInterfaces(INetwork.SendGuiNBT.class)) { - recieve.sendGuiNBT(nbt); + @SideOnly(Side.CLIENT) + public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { + for (final INetwork.ReceiveGuiNBT receive : this.getInterfaces(INetwork.ReceiveGuiNBT.class)) { + receive.receiveGuiNBTOnClient(player, name, nbt); + } + } + + @Override + public void sendGuiNBTToClient(final Map nbt) { + for (final INetwork.SendGuiNBT send : this.getInterfaces(INetwork.SendGuiNBT.class)) { + send.sendGuiNBTToClient(nbt); } } } diff --git a/src/main/java/binnie/core/machines/ModelBlock.java b/src/main/java/binnie/core/machines/ModelBlock.java index 1ced9421..8c3d3e68 100644 --- a/src/main/java/binnie/core/machines/ModelBlock.java +++ b/src/main/java/binnie/core/machines/ModelBlock.java @@ -2,6 +2,8 @@ package binnie.core.machines; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; class ModelBlock extends ModelBase { private ModelRenderer Block; @@ -16,6 +18,7 @@ class ModelBlock extends ModelBase { this.setRotation(this.Block, 0.0f, 0.0f, 0.0f); } + @SideOnly(Side.CLIENT) public void render(final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { super.render(null, f, f1, f2, f3, f4, f5); this.setRotationAngles(f, f1, f2, f3, f4, f5); diff --git a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java index d337bf1a..104525fd 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentChargedSlots.java @@ -6,7 +6,6 @@ import binnie.core.machines.network.INetwork; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.fml.relauncher.Side; import java.util.HashMap; import java.util.Map; @@ -49,7 +48,12 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork. } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + + } + + @Override + public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { if (name.equals("slot-charges")) { for (final int i : this.charges.keySet()) { this.charges.put(i, nbt.getShort("" + i) / 100.0f); @@ -58,7 +62,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork. } @Override - public void sendGuiNBT(final Map nbt) { + public void sendGuiNBTToClient(final Map nbt) { final NBTTagCompound tag = new NBTTagCompound(); for (final int i : this.charges.keySet()) { tag.setShort("" + i, (short) (this.charges.get(i) * 100.0f)); diff --git a/src/main/java/binnie/core/machines/inventory/SlotValidator.java b/src/main/java/binnie/core/machines/inventory/SlotValidator.java index 4bd78f25..cb175188 100644 --- a/src/main/java/binnie/core/machines/inventory/SlotValidator.java +++ b/src/main/java/binnie/core/machines/inventory/SlotValidator.java @@ -3,6 +3,8 @@ package binnie.core.machines.inventory; import forestry.api.genetics.AlleleManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -20,6 +22,7 @@ public abstract class SlotValidator extends Validator { } @Nullable + @SideOnly(Side.CLIENT) public TextureAtlasSprite getIcon(final boolean input) { return (this.sprite == null) ? null : this.sprite.getSprite(input).getSprite(); } diff --git a/src/main/java/binnie/core/machines/network/INetwork.java b/src/main/java/binnie/core/machines/network/INetwork.java index 8f1b00e8..3ca69663 100644 --- a/src/main/java/binnie/core/machines/network/INetwork.java +++ b/src/main/java/binnie/core/machines/network/INetwork.java @@ -3,12 +3,13 @@ package binnie.core.machines.network; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Map; public interface INetwork { interface SendGuiNBT { - void sendGuiNBT(final Map p0); + void sendGuiNBTToClient(final Map p0); } interface TilePacketSync { @@ -17,10 +18,13 @@ public interface INetwork { void syncFromNBT(final NBTTagCompound p0); } - interface RecieveGuiNBT { - void recieveGuiNBT(final Side p0, final EntityPlayer p1, final String p2, final NBTTagCompound p3); + interface ReceiveGuiNBT { + void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt); + + @SideOnly(Side.CLIENT) + void receiveGuiNBTOnClient(final EntityPlayer player, final String name, final NBTTagCompound nbt); } - interface GuiNBT extends RecieveGuiNBT, SendGuiNBT { + interface GuiNBT extends ReceiveGuiNBT, SendGuiNBT { } } diff --git a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java index b88c6e2f..41684834 100644 --- a/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java +++ b/src/main/java/binnie/core/machines/storage/ComponentCompartmentInventory.java @@ -6,7 +6,6 @@ import binnie.core.machines.network.INetwork; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.fml.relauncher.Side; import java.util.HashMap; import java.util.Map; @@ -54,7 +53,7 @@ class ComponentCompartmentInventory extends ComponentInventorySlots implements I } @Override - public void sendGuiNBT(final Map nbt) { + public void sendGuiNBTToClient(final Map nbt) { final NBTTagList list = new NBTTagList(); for (int i = 0; i < this.numberOfTabs; ++i) { final NBTTagCompound nbt2 = new NBTTagCompound(); @@ -67,7 +66,7 @@ class ComponentCompartmentInventory extends ComponentInventorySlots implements I } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { if (name.equals("comp-tabs")) { final NBTTagList tags = nbt.getTagList("tabs", 10); for (int i = 0; i < tags.tagCount(); ++i) { @@ -77,6 +76,10 @@ class ComponentCompartmentInventory extends ComponentInventorySlots implements I this.tabs.put(tab.getId(), tab); } } + } + + @Override + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { if (name.equals("comp-change-tab")) { final CompartmentTab tab2 = new CompartmentTab(0); tab2.readFromNBT(nbt); diff --git a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index 44ba24bf..eed9bde1 100644 --- a/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -8,6 +8,8 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.minecraft.EnumColor; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; class ControlColourSelector extends Control implements ITooltip, IControlValue { private EnumColor value; @@ -35,6 +37,7 @@ class ControlColourSelector extends Control implements ITooltip, IControlValue { + @SuppressWarnings({"unused", "NullableProblems"}) + @SidedProxy(modId = Constants.CORE_MOD_ID) + private static MessageProxy messageProxy; + @Nullable private IPacketProvider provider; @@ -37,30 +43,38 @@ public abstract class BinniePacketHandler implements IMessageHandler id.onMessage(message, ctx)); + } + } + } + + @SuppressWarnings("unused") @SideOnly(Side.CLIENT) - private static void onClientMessage(final IPacketID id, final MessageBinnie message, final MessageContext ctx) { - checkThreadAndEnqueue(id, message, ctx, Minecraft.getMinecraft()); + public static class ClientProxy extends MessageProxy { + @Override + public void onMessage(IPacketID id, MessageBinnie message, MessageContext ctx) { + checkThreadAndEnqueue(id, message, ctx, Minecraft.getMinecraft()); + } } - private static void onServerMessage(final IPacketID id, final MessageBinnie message, final MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - checkThreadAndEnqueue(id, message, ctx, player.getServerWorld()); - } - - private static void checkThreadAndEnqueue(final IPacketID id, final MessageBinnie message, final MessageContext ctx, IThreadListener threadListener) { - if (!threadListener.isCallingFromMinecraftThread()) { - threadListener.addScheduledTask(() -> id.onMessage(message, ctx)); + @SuppressWarnings("unused") + public static class ServerProxy extends MessageProxy { + @Override + public void onMessage(IPacketID id, MessageBinnie message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + checkThreadAndEnqueue(id, message, ctx, player.getServerWorld()); } } } diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index d561be52..d0d80e33 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -105,6 +105,7 @@ public class WindowFieldKit extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle("Field Kit"); CraftGUI.render.setStyleSheet(new StyleSheetPunnett()); @@ -265,9 +266,9 @@ public class WindowFieldKit extends Window { } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - super.recieveGuiNBT(side, player, name, action); - if (side == Side.SERVER && name.equals("analyse")) { + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + super.receiveGuiNBTOnServer(player, name, nbt); + if (name.equals("analyse")) { this.getWindowInventory().setInventorySlotContents(0, Analyser.analyse(this.getWindowInventory().getStackInSlot(0))); this.getWindowInventory().decrStackSize(1, 1); } diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java index 86e09b81..15b8e41e 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java @@ -196,10 +196,10 @@ public class WindowGenesis extends Window { } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - super.recieveGuiNBT(side, player, name, action); - if (side == Side.SERVER && name.equals("genesis")) { - final ItemStack stack = new ItemStack(action); + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + super.receiveGuiNBTOnServer(player, name, nbt); + if (name.equals("genesis")) { + final ItemStack stack = new ItemStack(nbt); final InventoryPlayer playerInv = player.inventory; if (stack.isEmpty()) { return; diff --git a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/craftgui/controls/ControlCheckbox.java index 9f9fd7e0..abcb9114 100644 --- a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/craftgui/controls/ControlCheckbox.java @@ -12,6 +12,8 @@ import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventMouse; import binnie.craftgui.events.EventValueChanged; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlCheckbox extends Control implements IControlValue { private boolean value; @@ -57,6 +59,7 @@ public class ControlCheckbox extends Control implements IControlValue { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { Object texture = this.getValue() ? CraftGUITexture.CheckboxChecked : CraftGUITexture.Checkbox; if (this.isMouseOver()) { diff --git a/src/main/java/binnie/craftgui/controls/ControlText.java b/src/main/java/binnie/craftgui/controls/ControlText.java index 26950127..032d36da 100644 --- a/src/main/java/binnie/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/craftgui/controls/ControlText.java @@ -7,6 +7,8 @@ import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.core.renderer.RenderUtil; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlText extends Control implements IControlValue { private String text; @@ -27,6 +29,7 @@ public class ControlText extends Control implements IControlValue { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawText(this.getArea(), this.align, this.text, this.getColour()); } diff --git a/src/main/java/binnie/craftgui/controls/ControlTextEdit.java b/src/main/java/binnie/craftgui/controls/ControlTextEdit.java index de867123..dc7819e1 100644 --- a/src/main/java/binnie/craftgui/controls/ControlTextEdit.java +++ b/src/main/java/binnie/craftgui/controls/ControlTextEdit.java @@ -17,7 +17,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ControlTextEdit extends Control implements IControlValue { - GuiTextField field; + private GuiTextField field; private String cachedValue; public ControlTextEdit(final IWidget parent, final int x, final int y, final int width, final int height) { diff --git a/src/main/java/binnie/craftgui/controls/button/ControlButton.java b/src/main/java/binnie/craftgui/controls/button/ControlButton.java index d7198a05..dcf7fcc6 100644 --- a/src/main/java/binnie/craftgui/controls/button/ControlButton.java +++ b/src/main/java/binnie/craftgui/controls/button/ControlButton.java @@ -10,6 +10,8 @@ import binnie.craftgui.events.EventButtonClicked; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventMouse; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -56,6 +58,7 @@ public class ControlButton extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { Object texture = CraftGUITexture.ButtonDisabled; if (this.isMouseOver()) { diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java b/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java index 06ad99a5..21514a16 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlOption.java @@ -7,6 +7,8 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; import binnie.craftgui.events.EventMouse; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlOption extends Control implements IControlValue { private T value; @@ -51,6 +53,7 @@ public class ControlOption extends Control implements IControlValue { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { if (this.isCurrentSelection()) { CraftGUI.render.texture(CraftGUITexture.Outline, this.getArea()); diff --git a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java index 12f63903..f815a457 100644 --- a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java @@ -7,6 +7,8 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.events.EventMouse; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlScrollBar extends Control { protected final IControlScrollable scrollable; @@ -67,6 +69,7 @@ public class ControlScrollBar extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { final IArea renderArea = this.getRenderArea(); Object texture = CraftGUITexture.ScrollDisabled; diff --git a/src/main/java/binnie/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/craftgui/controls/tab/ControlTab.java index 5b722b50..7943ebe4 100644 --- a/src/main/java/binnie/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/craftgui/controls/tab/ControlTab.java @@ -16,6 +16,8 @@ import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.craftgui.minecraft.control.ControlTabIcon; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlTab extends Control implements ITooltip, IControlValue { private ControlTabBar tabBar; @@ -68,6 +70,7 @@ public class ControlTab extends Control implements ITooltip, IControlValue } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { Object texture = CraftGUITexture.TabDisabled; if (this.isMouseOver()) { diff --git a/src/main/java/binnie/craftgui/core/IWidget.java b/src/main/java/binnie/craftgui/core/IWidget.java index addce752..9d12ca74 100644 --- a/src/main/java/binnie/craftgui/core/IWidget.java +++ b/src/main/java/binnie/craftgui/core/IWidget.java @@ -59,6 +59,7 @@ public interface IWidget { @SideOnly(Side.CLIENT) void render(int guiWidth, int guiHeight); + @SideOnly(Side.CLIENT) void updateClient(); void enable(); diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/craftgui/core/Widget.java index ce5d2062..7957a0a8 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/craftgui/core/Widget.java @@ -299,6 +299,7 @@ public class Widget implements IWidget { } @Override + @SideOnly(Side.CLIENT) public final void updateClient() { if (!this.isVisible()) { return; diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index e15c4e49..93065c61 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -29,6 +29,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.ArrayList; @@ -185,21 +186,24 @@ public class ContainerCraftGUI extends Container { return heldItem; } - public boolean handleNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - if (side == Side.SERVER) { - if (name.equals("tank-click")) { - this.tankClick(player, action.getByte("id")); - } - if (name.equals("slot-reg")) { - final int type = action.getByte("t"); - final int index = action.getShort("i"); - final int slotNumber = action.getShort("n"); - this.createServerSlot(InventoryType.values()[type % 4], index, slotNumber); - for (IContainerListener listener : listeners) { - listener.updateCraftingInventory(this, this.getInventory()); - } + public boolean handleNBTServer(final EntityPlayer player, final String name, final NBTTagCompound action) { + if (name.equals("tank-click")) { + this.tankClick(player, action.getByte("id")); + } + if (name.equals("slot-reg")) { + final int type = action.getByte("t"); + final int index = action.getShort("i"); + final int slotNumber = action.getShort("n"); + this.createServerSlot(InventoryType.values()[type % 4], index, slotNumber); + for (IContainerListener listener : listeners) { + listener.updateCraftingInventory(this, this.getInventory()); } } + return false; + } + + @SideOnly(Side.CLIENT) + public boolean handleNBTClient( final EntityPlayer player, final String name, final NBTTagCompound action) { if (name.contains("tank-update")) { this.onTankUpdate(action); } else if (name.equals("power-update")) { @@ -216,7 +220,6 @@ public class ContainerCraftGUI extends Container { return false; } - //TODO: Fix random NullPointerException @Override public void detectAndSendChanges() { super.detectAndSendChanges(); @@ -244,7 +247,7 @@ public class ContainerCraftGUI extends Container { } final INetwork.SendGuiNBT machineSync = Machine.getInterface(INetwork.SendGuiNBT.class, this.window.getInventory()); if (machineSync != null) { - machineSync.sendGuiNBT(this.syncedNBT); + machineSync.sendGuiNBTToClient(this.syncedNBT); } final Map sentThisTime = new HashMap<>(); for (final Map.Entry nbt : this.syncedNBT.entrySet()) { @@ -356,6 +359,7 @@ public class ContainerCraftGUI extends Container { return slots.toArray(new CustomSlot[0]); } + @SideOnly(Side.CLIENT) public void setMouseOverSlot(final Slot slot) { if (slot.slotNumber != this.mousedOverSlotNumber) { this.mousedOverSlotNumber = slot.slotNumber; @@ -387,6 +391,7 @@ public class ContainerCraftGUI extends Container { this.syncedNBT.put("shift-click-info", nbt); } + @SideOnly(Side.CLIENT) private void onRecieveShiftClickHighlights(final EntityPlayer player, final NBTTagCompound data) { ControlSlot.highlighting.get(EnumHighlighting.ShiftClick).clear(); for (final int slotnumber : data.getIntArray("slots")) { @@ -407,15 +412,28 @@ public class ContainerCraftGUI extends Container { return null; } - public void recieveNBT(final Side side, final EntityPlayer player, final NBTTagCompound action) { + public void receiveNBTServer(final EntityPlayer player, final NBTTagCompound action) { final String name = action.getString("type"); - if (this.handleNBT(side, player, name, action)) { + if (this.handleNBTServer(player, name, action)) { return; } - this.window.recieveGuiNBT(this.getSide(), player, name, action); - final INetwork.RecieveGuiNBT machine = Machine.getInterface(INetwork.RecieveGuiNBT.class, this.window.getInventory()); + this.window.receiveGuiNBTOnServer(player, name, action); + final INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, this.window.getInventory()); if (machine != null) { - machine.recieveGuiNBT(this.getSide(), player, name, action); + machine.receiveGuiNBTOnServer(player, name, action); + } + } + + @SideOnly(Side.CLIENT) + public void receiveNBTClient(final EntityPlayer player, final NBTTagCompound action) { + final String name = action.getString("type"); + if (this.handleNBTClient(player, name, action)) { + return; + } + this.window.receiveGuiNBTOnClient(player, name, action); + final INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, this.window.getInventory()); + if (machine != null) { + machine.receiveGuiNBTOnClient(player, name, action); } } diff --git a/src/main/java/binnie/craftgui/minecraft/Dialog.java b/src/main/java/binnie/craftgui/minecraft/Dialog.java index e59b95db..f04fae23 100644 --- a/src/main/java/binnie/craftgui/minecraft/Dialog.java +++ b/src/main/java/binnie/craftgui/minecraft/Dialog.java @@ -9,6 +9,8 @@ import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventMouse; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public abstract class Dialog extends Control { public Dialog(final IWidget parent, final int w, final int h) { @@ -34,6 +36,7 @@ public abstract class Dialog extends Control { public abstract void onClose(); @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawGradientRect(this.getArea().outset(400), -1442840576, -1442840576); CraftGUI.render.texture(CraftGUITexture.Window, this.getArea()); diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index 38bbad6a..3c28cb00 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -47,7 +47,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Deque; -public abstract class Window extends TopLevelWidget implements INetwork.RecieveGuiNBT { +public abstract class Window extends TopLevelWidget implements INetwork.ReceiveGuiNBT { @Nullable // client side only private GuiCraftGUI gui; private ContainerCraftGUI container; @@ -289,19 +289,24 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - if (side == Side.CLIENT && name.equals("username")) { + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + + } + + @Override + public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { + if (name.equals("username")) { final int w = this.w(); final int titleButtonRight = this.titleButtonRight + 16; this.titleButtonRight = titleButtonRight; - final ControlUser controlUser = new ControlUser(this, w - titleButtonRight, 8, action.getString("username")); + final ControlUser controlUser = new ControlUser(this, w - titleButtonRight, 8, nbt.getString("username")); this.titleButtonRight += 6; } - if (side == Side.CLIENT && name.equals("power-system")) { + if (name.equals("power-system")) { final int w2 = this.w(); final int titleButtonRight2 = this.titleButtonRight + 16; this.titleButtonRight = titleButtonRight2; - final ControlPowerSystem controlPowerSystem = new ControlPowerSystem(this, w2 - titleButtonRight2, 8, PowerSystem.get(action.getByte("system"))); + final ControlPowerSystem controlPowerSystem = new ControlPowerSystem(this, w2 - titleButtonRight2, 8, PowerSystem.get(nbt.getByte("system"))); this.titleButtonRight += 6; } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java index 060edbcf..247150f5 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java @@ -19,6 +19,8 @@ import binnie.craftgui.minecraft.Window; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.inventory.IInventory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -76,6 +78,7 @@ public class ControlEnergyBar extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.EnergyBarBack, this.getArea()); final float percentage = this.getPercentage() / 100.0f; @@ -109,6 +112,7 @@ public class ControlEnergyBar extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { if (this.isMouseOver() && Window.get(this).getGui().isHelpMode()) { final IArea area = this.getArea(); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlHelp.java b/src/main/java/binnie/craftgui/minecraft/control/ControlHelp.java index 462afb02..b83e2c94 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlHelp.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlHelp.java @@ -7,6 +7,8 @@ import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlHelp extends Control implements ITooltip { public ControlHelp(final IWidget parent, final int x, final int y) { @@ -15,6 +17,7 @@ public class ControlHelp extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.HelpButton, this.getArea()); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java index 1e306983..ee570a78 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java @@ -7,6 +7,8 @@ import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.core.renderer.RenderUtil; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlIconDisplay extends Control { private TextureAtlasSprite sprite; @@ -17,6 +19,7 @@ public class ControlIconDisplay extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { RenderUtil.drawSprite(IPoint.ZERO, this.sprite); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java b/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java index 24b1d1f0..5ba41b5f 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java @@ -5,6 +5,8 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.resource.Texture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlImage extends Control { private Object key; @@ -15,6 +17,7 @@ public class ControlImage extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { CraftGUI.render.texture(this.key, IPoint.ZERO); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlInfo.java b/src/main/java/binnie/craftgui/minecraft/control/ControlInfo.java index 897d937f..6356ff32 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlInfo.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlInfo.java @@ -7,6 +7,8 @@ import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlInfo extends Control implements ITooltip { private String info; @@ -18,6 +20,7 @@ public class ControlInfo extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.InfoButton, this.getArea()); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlPowerSystem.java b/src/main/java/binnie/craftgui/minecraft/control/ControlPowerSystem.java index 4c92dc9d..d812ea72 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlPowerSystem.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlPowerSystem.java @@ -8,6 +8,8 @@ import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlPowerSystem extends Control implements ITooltip { private PowerSystem system; @@ -19,6 +21,7 @@ public class ControlPowerSystem extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.PowerButton, this.getArea()); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlProgress.java b/src/main/java/binnie/craftgui/minecraft/control/ControlProgress.java index 70c00084..ad18ea9e 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlProgress.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlProgress.java @@ -4,6 +4,8 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.resource.Texture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlProgress extends ControlProgressBase { private Texture progressBlank; @@ -19,6 +21,7 @@ public class ControlProgress extends ControlProgressBase { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(this.progressBlank, this.getArea()); CraftGUI.render.texturePercentage(this.progressBar, this.getArea(), this.direction, this.progress); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java index 0f970256..a5319a59 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java @@ -128,6 +128,7 @@ public class ControlSlot extends ControlSlotBase { } @Override + @SideOnly(Side.CLIENT) public void onRenderOverlay() { boolean highlighted = false; for (final Map.Entry> highlight : ControlSlot.highlighting.entrySet()) { diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotCharge.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotCharge.java index 218ac926..e647b5cc 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotCharge.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotCharge.java @@ -9,6 +9,8 @@ import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.minecraft.Window; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlSlotCharge extends Control { private int slot; @@ -19,6 +21,7 @@ public class ControlSlotCharge extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.PanelBlack, this.getArea()); CraftGUI.render.texturePercentage(CraftGUI.render.getTexture(CraftGUITexture.SlotCharge), this.getArea().inset(1), Position.Bottom, this.getCharge()); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlUser.java b/src/main/java/binnie/craftgui/minecraft/control/ControlUser.java index 0de5fa0e..7011705e 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlUser.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlUser.java @@ -7,6 +7,8 @@ import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Objects; @@ -23,6 +25,7 @@ public class ControlUser extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.UserButton, this.getArea()); } diff --git a/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java b/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java index 46137300..e925dcc1 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java @@ -11,6 +11,8 @@ import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITexture; import binnie.craftgui.resource.minecraft.CraftGUITextureSheet; import binnie.craftgui.resource.minecraft.StandardTexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; class ControlBreedingProgress extends Control { private static Texture Progress = new StandardTexture(80, 22, 4, 4, CraftGUITextureSheet.Controls2); @@ -24,6 +26,7 @@ class ControlBreedingProgress extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.PanelBlack, this.getArea()); final IArea area = this.getArea().inset(1); diff --git a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java index fb4bb822..f6b9c117 100644 --- a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java @@ -28,6 +28,7 @@ import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IClassification; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.Collection; @@ -93,6 +94,7 @@ public abstract class WindowAbstractDatabase extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setSize(new IPoint(176 + this.selectionBoxWidth + 22 + 8, 208)); this.addEventHandler(new EventValueChanged.Handler() { @@ -204,6 +206,7 @@ public abstract class WindowAbstractDatabase extends Window { } @Override + @SideOnly(Side.CLIENT) public void onUpdateClient() { super.onUpdateClient(); if (this.gotoSpecies != null) { diff --git a/src/main/java/binnie/craftgui/resource/IStyleSheet.java b/src/main/java/binnie/craftgui/resource/IStyleSheet.java index 0bbe7ffc..eac71ef9 100644 --- a/src/main/java/binnie/craftgui/resource/IStyleSheet.java +++ b/src/main/java/binnie/craftgui/resource/IStyleSheet.java @@ -1,5 +1,9 @@ package binnie.craftgui.resource; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + public interface IStyleSheet { + @SideOnly(Side.CLIENT) Texture getTexture(final Object p0); } diff --git a/src/main/java/binnie/craftgui/resource/StyleSheet.java b/src/main/java/binnie/craftgui/resource/StyleSheet.java index 25c534d7..e2e4966a 100644 --- a/src/main/java/binnie/craftgui/resource/StyleSheet.java +++ b/src/main/java/binnie/craftgui/resource/StyleSheet.java @@ -1,5 +1,8 @@ package binnie.craftgui.resource; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import java.util.HashMap; import java.util.Map; @@ -11,6 +14,7 @@ public class StyleSheet implements IStyleSheet { } @Override + @SideOnly(Side.CLIENT) public Texture getTexture(final Object key) { if (!this.textures.containsKey(key)) { return StyleSheetManager.getTexture(key); diff --git a/src/main/java/binnie/craftgui/resource/StyleSheetManager.java b/src/main/java/binnie/craftgui/resource/StyleSheetManager.java index 374e57ad..7756fb43 100644 --- a/src/main/java/binnie/craftgui/resource/StyleSheetManager.java +++ b/src/main/java/binnie/craftgui/resource/StyleSheetManager.java @@ -1,10 +1,13 @@ package binnie.craftgui.resource; import binnie.craftgui.core.CraftGUI; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class StyleSheetManager { static IStyleSheet defaultSS = new DefaultStyleSheet(); + @SideOnly(Side.CLIENT) public static Texture getTexture(final Object key) { return StyleSheetManager.defaultSS.getTexture(key); } @@ -15,6 +18,7 @@ public class StyleSheetManager { private static class DefaultStyleSheet implements IStyleSheet { @Override + @SideOnly(Side.CLIENT) public Texture getTexture(final Object key) { return CraftGUI.resourceManager.getTexture(key.toString()); } diff --git a/src/main/java/binnie/craftgui/window/Panel.java b/src/main/java/binnie/craftgui/window/Panel.java index 462edef2..cf8dc016 100644 --- a/src/main/java/binnie/craftgui/window/Panel.java +++ b/src/main/java/binnie/craftgui/window/Panel.java @@ -6,6 +6,8 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.minecraft.MinecraftGUI; import binnie.craftgui.resource.minecraft.CraftGUITexture; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class Panel extends Control { IPanelType type; @@ -24,6 +26,7 @@ public class Panel extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { final IPanelType panelType = this.getType(); if (panelType instanceof MinecraftGUI.PanelType) { diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java index 9dd7f2bb..21bde0db 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java @@ -13,6 +13,8 @@ import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import net.minecraft.world.biome.Biome; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; @@ -43,6 +45,7 @@ public class ControlBiomes extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { for (int i = 0; i < this.tolerated.size(); ++i) { final int x = i % 8 * 16; diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index 3955fd72..45152364 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -16,6 +16,8 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; @@ -65,6 +67,7 @@ public class ControlClimateBar extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.EnergyBarBack, this.getArea()); final int types = this.isHumidity ? 3 : 6; diff --git a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java b/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java index d398ed95..c6c01eb7 100644 --- a/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/extrabees/gui/punnett/ControlChromosome.java @@ -9,6 +9,8 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.renderer.RenderUtil; import forestry.api.genetics.IChromosomeType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -32,6 +34,7 @@ public class ControlChromosome extends Control implements IControlValue implements IColoredItem { public ItemBlockETDecorativeLeaves(Block block) { @@ -30,6 +32,7 @@ public class ItemBlockETDecorativeLeaves extends ItemBlockForestry { private static final Texture DISTILLERY_BASE = new StandardTexture(43, 0, 58, 60, ExtraTreeTexture.Gui); @@ -45,6 +47,7 @@ public class DistilleryRecipeCategory extends BlankRecipeCategory= 0) { - this.doRecipe(true); - recipe.grow(playerInv.getItemStack().getCount()); - playerInv.setItemStack(recipe); - } - } - player.openContainer.detectAndSendChanges(); - if (player instanceof EntityPlayerMP) { - ((EntityPlayerMP) player).updateHeldItem(); - } - } - } else if (name.equals("design")) { - this.setDesign(CarpentryManager.carpentryInterface.getDesign(nbt.getShort("d"))); - } - } - private void setDesign(final IDesign design) { this.design = design; } @@ -183,12 +156,43 @@ public abstract class Designer { } @Override - public void sendGuiNBT(final Map nbt) { + public void sendGuiNBTToClient(final Map nbt) { final NBTTagCompound tag = new NBTTagCompound(); tag.setShort("d", (short) CarpentryManager.carpentryInterface.getDesignIndex(this.getDesign())); nbt.put("design", tag); } + @Override + public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { + if (name.equals("design")) { + this.setDesign(CarpentryManager.carpentryInterface.getDesign(nbt.getShort("d"))); + } + } + + @Override + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + if (name.equals("recipe")) { + final InventoryPlayer playerInv = player.inventory; + final ItemStack recipe = this.doRecipe(false); + if (!recipe.isEmpty()) { + if (playerInv.getItemStack().isEmpty()) { + playerInv.setItemStack(this.doRecipe(true)); + } else if (playerInv.getItemStack().isItemEqual(recipe) && ItemStack.areItemStackTagsEqual(playerInv.getItemStack(), recipe)) { + final int fit = recipe.getMaxStackSize() - (recipe.getCount() + playerInv.getItemStack().getCount()); + if (fit >= 0) { + this.doRecipe(true); + recipe.grow(playerInv.getItemStack().getCount()); + playerInv.setItemStack(recipe); + } + } + player.openContainer.detectAndSendChanges(); + if (player instanceof EntityPlayerMP) { + ((EntityPlayerMP) player).updateHeldItem(); + } + } + } + } + public DesignerType getDesignerType() { return this.type; } diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java index b92a0f0f..3e6eaf52 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java @@ -5,6 +5,8 @@ import binnie.core.resource.BinnieResource; import binnie.core.resource.ResourceType; import binnie.extratrees.ExtraTrees; import net.minecraft.client.renderer.GlStateManager; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class MachineRendererNursery { public static MachineRendererNursery instance = new MachineRendererNursery(); @@ -17,6 +19,7 @@ public class MachineRendererNursery { this.model = new ModelNursery(); } + @SideOnly(Side.CLIENT) public void renderMachine(final BinnieResource texture, final double x, final double y, final double z, final float var8) { this.texture = texture; GlStateManager.pushMatrix(); diff --git a/src/main/java/binnie/extratrees/machines/ModelNursery.java b/src/main/java/binnie/extratrees/machines/ModelNursery.java index cbc31401..acd988c6 100644 --- a/src/main/java/binnie/extratrees/machines/ModelNursery.java +++ b/src/main/java/binnie/extratrees/machines/ModelNursery.java @@ -3,6 +3,8 @@ package binnie.extratrees.machines; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ModelNursery extends ModelBase { ModelRenderer Shape1; @@ -90,6 +92,7 @@ public class ModelNursery extends ModelBase { } @Override + @SideOnly(Side.CLIENT) public void render(final Entity entity, final float f, final float f1, final float f2, final float f3, final float f4, final float f5) { super.render(entity, f, f1, f2, f3, f4, f5); this.setRotationAngles(f, f1, f2, f3, f4, f5, entity); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java index afbffc89..179d6c64 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java @@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; import javax.annotation.Nullable; import java.util.Map; @@ -87,7 +86,7 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I } @Override - public void sendGuiNBT(final Map data) { + public void sendGuiNBTToClient(final Map data) { final NBTTagCompound nbt = new NBTTagCompound(); if (this.currentCrafting == null) { nbt.setBoolean("null", true); @@ -98,7 +97,12 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + + } + + @Override + public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { if (name.equals("brewery-recipe")) { if (nbt.getBoolean("null")) { this.currentCrafting = null; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java index efd7f180..1c68f7b4 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java @@ -5,6 +5,8 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.core.renderer.RenderUtil; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlBlockIconDisplay extends Control { TextureAtlasSprite icon; @@ -15,6 +17,7 @@ public class ControlBlockIconDisplay extends Control { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawSprite(IPoint.ZERO, this.icon); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java index acdf2b37..da3e831d 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java @@ -16,6 +16,8 @@ import binnie.extratrees.core.ExtraTreeTexture; import binnie.extratrees.machines.brewery.BreweryLogic; import binnie.extratrees.machines.brewery.BreweryRecipes; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import java.util.Collections; @@ -25,6 +27,7 @@ public class ControlBreweryProgress extends ControlProgressBase { static Texture BreweryOverlay = new StandardTexture(34, 69, 34, 39, ExtraTreeTexture.Gui); @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(ControlBreweryProgress.Brewery, IPoint.ZERO); final BreweryLogic logic = Machine.getInterface(BreweryLogic.class, Window.get(this).getInventory()); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java index 5aa453f5..96d5f45f 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java @@ -27,6 +27,7 @@ public class ControlDistilleryProgress extends ControlProgressBase { public static final Texture OUTPUT = new StandardTexture(68, 66, 17, 7, ExtraTreeTexture.Gui); @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(DISTILLERY_BASE, IPoint.ZERO); CraftGUI.render.texturePercentage(LIQUID_FLOW, new IArea(18, 0, 38, 66), Position.Left, this.progress); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java index 6d6a0f8b..4e4738b9 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java @@ -28,6 +28,7 @@ public class ControlFruitPressProgress extends ControlProgressBase { private static final Texture PressSlot = new StandardTexture(9, 52, 34, 17, ExtraTreeTexture.Gui); @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(ControlFruitPressProgress.PressSlot, new IPoint(3, 52)); ContainerCraftGUI container = Window.get(this).getContainer(); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index d1cbd53b..425f8a49 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -157,11 +157,13 @@ public class ControlTileSelect extends Control implements IControlValue } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO); } @Override + @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { final ItemStack image = ((WindowWoodworker) this.getTopParent()).getDesignerType().getDisplayStack(this.getValue()); RenderUtil.drawItem(new IPoint(1, 1), image); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java index b377bfb6..9e441c2e 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowPress.java @@ -58,10 +58,10 @@ public class WindowPress extends Window { } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + super.receiveGuiNBTOnServer(player, name, nbt); final FruitPressLogic logic = Machine.getInterface(FruitPressLogic.class, this.getInventory()); - super.recieveGuiNBT(side, player, name, action); - if (logic != null && side == Side.SERVER) { + if (logic != null) { if (name.equals("fruitpress-click") && logic.canWork() == null && (logic.canProgress() == null || logic.canProgress() instanceof ErrorState.InsufficientPower)) { logic.alterProgress(2.0f); } else if (name.equals("clear-fruit")) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index 9e0c0bc8..559b2664 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -23,6 +23,7 @@ import binnie.extratrees.machines.DesignerType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; @@ -31,6 +32,7 @@ public class WindowWoodworker extends Window { ControlTileSelect tileSelect; @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); new ControlText(this, new IArea(190, 36, 114, 10), BinnieCore.getBinnieProxy().localise("gui.design"), TextJustification.TopCenter).setColour(4473924); diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java index 7f345b8f..875a1e4c 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java @@ -9,12 +9,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; import javax.annotation.Nullable; import java.util.Map; -public class DistilleryLogic extends ComponentProcessSetCost implements IProcess, INetwork.SendGuiNBT, INetwork.RecieveGuiNBT { +public class DistilleryLogic extends ComponentProcessSetCost implements IProcess, INetwork.SendGuiNBT, INetwork.ReceiveGuiNBT { public static final int INPUT_FLUID_AMOUNT = Fluid.BUCKET_VOLUME; @Nullable @@ -101,7 +100,12 @@ public class DistilleryLogic extends ComponentProcessSetCost implements IProcess } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound nbt) { + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + + } + + @Override + public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { if (name.equals("still-level")) { this.level = nbt.getByte("i"); this.setProgress(0); @@ -116,7 +120,7 @@ public class DistilleryLogic extends ComponentProcessSetCost implements IProcess } @Override - public void sendGuiNBT(final Map data) { + public void sendGuiNBTToClient(final Map data) { final NBTTagCompound nbt = new NBTTagCompound(); if (this.currentFluid == null) { nbt.setBoolean("null", true); diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index 6d232177..0657c0fd 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -13,6 +13,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.ArrayList; @@ -47,6 +49,7 @@ public class GeneArrayItem implements INbtReadable, INbtWritable, IGeneItem { } @Override + @SideOnly(Side.CLIENT) public void getInfo(final List list) { final List totalList = new ArrayList<>(); diff --git a/src/main/java/binnie/genetics/genetics/GeneItem.java b/src/main/java/binnie/genetics/genetics/GeneItem.java index cbd30590..fef92898 100644 --- a/src/main/java/binnie/genetics/genetics/GeneItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneItem.java @@ -12,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.Constants; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.List; @@ -53,6 +55,7 @@ public class GeneItem implements INbtWritable, IGeneItem { } @Override + @SideOnly(Side.CLIENT) public void getInfo(final List list) { final String chromosomeName = this.getBreedingSystem().getChromosomeName(this.gene.getChromosome()); list.add(TextFormatting.GOLD + chromosomeName + TextFormatting.GRAY + ": " + this.gene.getName()); diff --git a/src/main/java/binnie/genetics/genetics/IGeneItem.java b/src/main/java/binnie/genetics/genetics/IGeneItem.java index 7603801a..3a263239 100644 --- a/src/main/java/binnie/genetics/genetics/IGeneItem.java +++ b/src/main/java/binnie/genetics/genetics/IGeneItem.java @@ -3,6 +3,8 @@ package binnie.genetics.genetics; import binnie.genetics.api.IGene; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.List; @@ -11,6 +13,7 @@ public interface IGeneItem { @Nullable ISpeciesRoot getSpeciesRoot(); + @SideOnly(Side.CLIENT) void getInfo(final List p0); int getColour(final int p0); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index b8adcfdc..4fcabb29 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -16,7 +16,10 @@ import forestry.api.lepidopterology.IAlleleButterflyEffect; import forestry.api.lepidopterology.IButterfly; import forestry.apiculture.PluginApiculture; import net.minecraft.util.math.Vec3i; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class AnalystPageBehaviour extends ControlAnalystPage { public AnalystPageBehaviour(final IWidget parent, final IArea area, final IIndividual ind) { super(parent, area); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index c8345c77..17e1c20c 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -20,6 +20,8 @@ import binnie.craftgui.window.Panel; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.ArrayList; @@ -67,6 +69,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.setColour(5592405); CraftGUI.render.texture(CraftGUITexture.TabSolid, this.getArea().inset(1)); @@ -100,6 +103,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { IAlleleSpecies value = v; @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawText(this.getArea(), TextJustification.MiddleCenter, this.value.getName(), 16777215); } @@ -112,6 +116,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { } new ControlScrollBar(this, this.scroll.x() + this.scroll.w() - 6, this.scroll.y() + 3, 3, this.scroll.h() - 6, this.scroll) { @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { if (!this.isEnabled()) { return; @@ -137,6 +142,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { public void initialise() { this.addSelfEventHandler(new EventMouse.Down.Handler() { @Override + @SideOnly(Side.CLIENT) public void onEvent(final EventMouse.Down event) { final WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getTopParent(); window.setIndividual(ind); @@ -145,6 +151,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { final WindowAnalyst window = (WindowAnalyst) AnalystPageDatabase.this.getTopParent(); if (window.getIndividual() != null && window.getIndividual().getGenome().getPrimary() == species) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index 2002f5c3..0b5146b4 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -9,9 +9,12 @@ import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.core.geometry.TextJustification; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Objects; +@SideOnly(Side.CLIENT) public class AnalystPageDescription extends ControlAnalystPage { public AnalystPageDescription(final IWidget parent, final IArea area, final IIndividual ind) { super(parent, area); diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index a53ceeab..22199ddf 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class AnalystPageGenome extends ControlAnalystPage { boolean active; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index 0723a3a4..8311f317 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -24,6 +24,8 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Collection; import java.util.List; @@ -129,6 +131,7 @@ public class AnalystPageMutations extends ControlAnalystPage { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawItem(IPoint.ZERO, system.getDefaultMember(mutation.getAllele0().getUID())); RenderUtil.drawItem(new IPoint(28, 0), system.getDefaultMember(mutation.getAllele1().getUID())); @@ -187,6 +190,7 @@ public class AnalystPageMutations extends ControlAnalystPage { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawItem(IPoint.ZERO, system.getDefaultMember(speciesComb.getUID())); RenderUtil.drawItem(new IPoint(28, 0), system.getDefaultMember(mutation.getTemplate()[0].getUID())); @@ -256,6 +260,7 @@ public class AnalystPageMutations extends ControlAnalystPage { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawText(this.getArea(), TextJustification.MiddleCenter, "UNKNOWN", 11184810); } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java index 9db505d2..a4cba21f 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProducts.java @@ -24,6 +24,8 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; import java.util.ArrayList; @@ -154,6 +156,7 @@ public class AnalystPageProducts extends AnalystPageProduce { private void createProductEntry(final ItemStack key, final Float value, final int y, final float speed) { final ControlItemDisplay item = new ControlItemDisplay(this, 16, y) { @Override + @SideOnly(Side.CLIENT) public void getTooltip(final Tooltip tooltip) { super.getTooltip(tooltip); final Collection products = AnalystPageProducts.this.getCentrifuge(key); diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index a47f6b27..663b6179 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -15,6 +15,8 @@ import binnie.craftgui.resource.minecraft.StandardTexture; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlAnalystChromosome extends Control implements ITooltip { IAllele allele0; @@ -40,6 +42,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); CraftGUI.render.texture(this.isHomozygous() ? this.Homozygous : this.Heterozygous, IPoint.ZERO); diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index f8bc2562..074e28c7 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -13,6 +13,8 @@ import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.StandardTexture; import binnie.extrabees.core.ExtraBeeTexture; import forestry.api.genetics.IChromosomeType; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlChromoPicker extends Control implements ITooltip { Texture Selected; @@ -42,6 +44,7 @@ public class ControlChromoPicker extends Control implements ITooltip { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); final boolean selected = this.isMouseOver(); diff --git a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java index e033893c..725c671b 100644 --- a/src/main/java/binnie/genetics/gui/ControlGenesisOption.java +++ b/src/main/java/binnie/genetics/gui/ControlGenesisOption.java @@ -6,6 +6,8 @@ import binnie.craftgui.controls.listbox.ControlOption; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.core.renderer.RenderUtil; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlGenesisOption extends ControlOption { public ControlGenesisOption(final ControlList parent, final Gene gene, final int y) { @@ -21,6 +23,7 @@ public class ControlGenesisOption extends ControlOption { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); RenderUtil.drawText(new IArea(0, 0, 70, 22), TextJustification.MiddleCenter, this.getChromosomeName(), this.getColour()); diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java index f67b59b3..e306ded3 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java @@ -12,6 +12,8 @@ import binnie.craftgui.core.renderer.RenderUtil; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.EnumSet; @@ -47,6 +49,7 @@ public abstract class ControlToleranceBar> extends Control imp protected abstract int getColour(final T p0); @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawGradientRect(this.getArea(), -1431655766, -1431655766); final int w = this.getArea().w() / this.fullSet.size(); diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 38d45b16..5c69b26e 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -128,6 +128,7 @@ public class WindowAnalyst extends Window { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(this.isDatabase ? (this.isMaster ? "Master Registry" : "Registry") : "Analyst"); final BreedingSystem system = Binnie.GENETICS.beeBreedingSystem; @@ -145,6 +146,7 @@ public class WindowAnalyst extends Window { this.addAttribute(Attribute.MouseOver); this.addSelfEventHandler(new EventMouse.Down.Handler() { @Override + @SideOnly(Side.CLIENT) public void onEvent(final EventMouse.Down event) { WindowAnalyst.this.setSystem(syst); } @@ -273,6 +275,7 @@ public class WindowAnalyst extends Window { this.setSystem(Binnie.GENETICS.beeBreedingSystem); } + @SideOnly(Side.CLIENT) public void setIndividual(final IIndividual ind) { if (!this.isDatabase) { if (ind == null) { @@ -293,6 +296,7 @@ public class WindowAnalyst extends Window { this.updatePages(systemChange); } + @SideOnly(Side.CLIENT) public void setSystem(final BreedingSystem system) { if (system == this.currentSystem) { return; @@ -302,6 +306,7 @@ public class WindowAnalyst extends Window { this.updatePages(true); } + @SideOnly(Side.CLIENT) public void updatePages(final boolean systemChange) { int oldLeft = -1; int oldRight = -1; @@ -475,13 +480,14 @@ public class WindowAnalyst extends Window { if (ind != null) { ind.getGenome().getSpeciesRoot().getBreedingTracker(this.getWorld(), this.getUsername()).registerBirth(ind); } - // TODO why is this specific client/server code needed? + if (this.isClient()) { + //noinspection MethodCallSideOnly this.setStack(this.getWindowInventory().getStackInSlot(0)); - } else if (this.isServer()) { } } + @SideOnly(Side.CLIENT) public void setStack(final ItemStack stack) { final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); this.setIndividual(ind); diff --git a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java index af480ae1..0342678b 100644 --- a/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java +++ b/src/main/java/binnie/genetics/integration/jei/genepool/GenepoolRecipeWrapper.java @@ -9,6 +9,8 @@ import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.awt.Color; import java.util.ArrayList; @@ -40,6 +42,7 @@ public class GenepoolRecipeWrapper extends BlankRecipeWrapper { } @Override + @SideOnly(Side.CLIENT) public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { float usedEnzyme = GenepoolLogic.ENZYME_PER_PROCESS; String usedString = String.format("%.2f", usedEnzyme); diff --git a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java index 585d0540..2a4a3fbc 100644 --- a/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/isolator/IsolatorRecipeCategory.java @@ -11,6 +11,8 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.awt.*; @@ -37,6 +39,7 @@ public class IsolatorRecipeCategory extends BlankRecipeCategory, ITooltip { private IGene gene; @@ -74,6 +76,7 @@ public class ControlGene extends Control implements IControlValue, IToolt } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { if (this.isMouseOver() && this.canFill(Window.get(this).getHeldItemStack())) { RenderUtil.drawSolidRect(this.getArea(), -1); diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java index 3ecb7bae..5884a303 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlProcessTemporary.java @@ -5,6 +5,8 @@ import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.geometry.IPoint; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.minecraft.control.ControlMachineProgress; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlProcessTemporary extends ControlMachineProgress { public ControlProcessTemporary(final IWidget parent, final int x, final int y, final int width, final int height) { @@ -13,6 +15,7 @@ public class ControlProcessTemporary extends ControlMachineProgress { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.drawSolidRect(this.getArea(), -4868683); final int w = Math.round(this.getSize().y() * this.progress / 100.0f); diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlSplicerProgress.java b/src/main/java/binnie/genetics/machine/craftgui/ControlSplicerProgress.java index 9c84c0e5..cf811f79 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlSplicerProgress.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlSplicerProgress.java @@ -4,6 +4,8 @@ import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.IArea; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.minecraft.control.ControlProgressBase; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ControlSplicerProgress extends ControlProgressBase { float strength; @@ -15,6 +17,7 @@ public class ControlSplicerProgress extends ControlProgressBase { } @Override + @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { final float progress = this.getProcess().getCurrentProgress() / 100.0f; final float n = this.getProcess().getProcessTime() / 12.0f; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java index 2797ba77..a0b4a09e 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -30,6 +30,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import java.util.Arrays; import java.util.List; @@ -41,10 +42,10 @@ public class WindowGeneBank extends WindowMachine { ControlGeneScroll genes; @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - super.recieveGuiNBT(side, player, name, action); - if (side == Side.SERVER && name.equals("gene-select")) { - final Gene gene = new Gene(action.getCompoundTag("gene")); + public void receiveGuiNBTOnServer(final EntityPlayer player, final String name, final NBTTagCompound nbt) { + super.receiveGuiNBTOnServer(player, name, nbt); + if (name.equals("gene-select")) { + final Gene gene = new Gene(nbt.getCompoundTag("gene")); if (gene != null && !false) { final ItemStack held = this.getHeldItemStack(); final ItemStack converted = Engineering.addGene(held, gene); @@ -75,8 +76,9 @@ public class WindowGeneBank extends WindowMachine { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { - this.setTitle("Gene Bank"); + super.initialiseClient(); this.addEventHandler(new EventValueChanged.Handler() { @Override public void onEvent(final EventValueChanged event) { diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java b/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java index c6126f2d..cda97e6e 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowIncubator.java @@ -19,6 +19,7 @@ import binnie.genetics.machine.incubator.Incubator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowIncubator extends WindowMachine { static Texture ProgressBase = new StandardTexture(0, 91, 38, 32, GeneticsTexture.GUIProcess); @@ -29,6 +30,7 @@ public class WindowIncubator extends WindowMachine { } @Override + @SideOnly(Side.CLIENT) public void initialiseClient() { super.initialiseClient(); int x = 16; diff --git a/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java b/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java index 939831d7..33644e39 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java +++ b/src/main/java/binnie/genetics/machine/craftgui/WindowSequencer.java @@ -36,11 +36,12 @@ public class WindowSequencer extends WindowMachine { } @Override - public void recieveGuiNBT(final Side side, final EntityPlayer player, final String name, final NBTTagCompound action) { - if (side == Side.CLIENT && name.equals("username")) { - this.slotText.setValue(TextFormatting.DARK_GRAY + String.format(Genetics.proxy.localise("machine.machine.sequencer.texts.sequenced.by"), action.getString("username"))); + @SideOnly(Side.CLIENT) + public void receiveGuiNBTOnClient(EntityPlayer player, String name, NBTTagCompound nbt) { + if (name.equals("username")) { + this.slotText.setValue(TextFormatting.DARK_GRAY + String.format(Genetics.proxy.localise("machine.machine.sequencer.texts.sequenced.by"), nbt.getString("username"))); } - super.recieveGuiNBT(side, player, name, action); + super.receiveGuiNBTOnClient(player, name, nbt); } @Override diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java index 938711af..fff8e9b3 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolFX.java @@ -21,35 +21,43 @@ public class GenepoolFX extends MachineComponent implements IRender.DisplayTick @Override public void onDisplayTick(World world, BlockPos pos, Random rand) { if (rand.nextFloat() < 1.0f && this.getUtil().getProcess().isInProgress()) { - BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.3 + rand.nextDouble() * 0.4, pos.getY() + 1, pos.getZ() + 0.3 + rand.nextDouble() * 0.4, 0.0, 0.0, 0.0) { - double axisX = this.posX; - double axisZ = this.posZ; - double angle = this.rand.nextDouble() * 2.0 * 3.1415; + final Particle particle = new GenepoolParticle(world, pos, rand); + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(particle); + } + } - { - this.axisX = 0.0; - this.axisZ = 0.0; - this.angle = 0.0; - this.motionX = 0.0; - this.motionZ = 0.0; - this.motionY = this.rand.nextFloat() * 0.01; - this.particleMaxAge = 25; - this.particleGravity = 0.0f; - this.canCollide = true; - this.setRBGColorF(0.4f + 0.6f * this.rand.nextFloat(), 0.6f * this.rand.nextFloat(), 0.6f + 0.4f * this.rand.nextFloat()); - } + @SideOnly(Side.CLIENT) + private static class GenepoolParticle extends Particle { + double axisX; + double axisZ; + double angle; - @Override - public void onUpdate() { - super.onUpdate(); - this.setAlphaF((float) Math.cos(1.57 * this.particleAge / this.particleMaxAge)); - } + public GenepoolParticle(World world, BlockPos pos, Random rand) { + super(world, pos.getX() + 0.3 + rand.nextDouble() * 0.4, pos.getY() + 1, pos.getZ() + 0.3 + rand.nextDouble() * 0.4, 0.0, 0.0, 0.0); + axisX = this.posX; + axisZ = this.posZ; + angle = this.rand.nextDouble() * 2.0 * 3.1415; + this.axisX = 0.0; + this.axisZ = 0.0; + this.angle = 0.0; + this.motionX = 0.0; + this.motionZ = 0.0; + this.motionY = this.rand.nextFloat() * 0.01; + this.particleMaxAge = 25; + this.particleGravity = 0.0f; + this.canCollide = true; + this.setRBGColorF(0.4f + 0.6f * this.rand.nextFloat(), 0.6f * this.rand.nextFloat(), 0.6f + 0.4f * this.rand.nextFloat()); + } - @Override - public int getFXLayer() { - return 0; - } - }); + @Override + public void onUpdate() { + super.onUpdate(); + this.setAlphaF((float) Math.cos(1.57 * this.particleAge / this.particleMaxAge)); + } + + @Override + public int getFXLayer() { + return 0; } } } diff --git a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java index c2a21c8f..d66d3408 100644 --- a/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java +++ b/src/main/java/binnie/genetics/machine/inoculator/InoculatorFX.java @@ -32,45 +32,8 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic public void onDisplayTick(World world, BlockPos pos, Random rand) { final int tick = (int) (world.getTotalWorldTime() % 3L); if (tick == 0 && this.getUtil().getProcess().isInProgress()) { - BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 0.92, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { - double axisX = this.posX; - double axisZ = this.posZ; - double angle = (int) (this.world.getTotalWorldTime() % 4L) * 0.5 * 3.1415; - - { - this.axisX = 0.0; - this.axisZ = 0.0; - this.angle = 0.0; - this.motionX = 0.0; - this.motionZ = 0.0; - this.motionY = 0.007 + this.rand.nextDouble() * 0.002; - this.particleMaxAge = 240; - this.particleGravity = 0.0f; - this.canCollide = true; - this.setRBGColorF(0.8f, 0.0f, 1.0f); - } - - @Override - public void onUpdate() { - super.onUpdate(); - double speed = 5.0E-4; - if (this.particleAge > 60) { - speed += (this.particleAge - 60) / 4000.0f; - } - this.angle += speed; - final double dist = 0.27; - this.setPosition(this.axisX + dist * Math.sin(this.angle), this.posY, this.axisZ + dist * Math.cos(this.angle)); - this.setAlphaF((float) Math.cos(1.57 * this.particleAge / this.particleMaxAge)); - if (this.particleAge > 40) { - this.setRBGColorF(this.particleRed + (1.0f - this.particleRed) / 10.0f, this.particleGreen + (0.0f - this.particleGreen) / 10.0f, this.particleBlue + (0.0f - this.particleBlue) / 10.0f); - } - } - - @Override - public int getFXLayer() { - return 0; - } - }); + final Particle particle = new InoculatorParticle(world, pos); + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(particle); } } @@ -126,4 +89,49 @@ public class InoculatorFX extends MachineComponent implements IRender.DisplayTic } this.getUtil().refreshBlock(); } + + @SideOnly(Side.CLIENT) + private static class InoculatorParticle extends Particle { + double axisX; + double axisZ; + double angle; + + public InoculatorParticle(World world, BlockPos pos) { + super(world, pos.getX() + 0.5, pos.getY() + 0.92, pos.getZ() + 0.5, 0.0, 0.0, 0.0); + axisX = this.posX; + axisZ = this.posZ; + angle = (int) (this.world.getTotalWorldTime() % 4L) * 0.5 * 3.1415; + this.axisX = 0.0; + this.axisZ = 0.0; + this.angle = 0.0; + this.motionX = 0.0; + this.motionZ = 0.0; + this.motionY = 0.007 + this.rand.nextDouble() * 0.002; + this.particleMaxAge = 240; + this.particleGravity = 0.0f; + this.canCollide = true; + this.setRBGColorF(0.8f, 0.0f, 1.0f); + } + + @Override + public void onUpdate() { + super.onUpdate(); + double speed = 5.0E-4; + if (this.particleAge > 60) { + speed += (this.particleAge - 60) / 4000.0f; + } + this.angle += speed; + final double dist = 0.27; + this.setPosition(this.axisX + dist * Math.sin(this.angle), this.posY, this.axisZ + dist * Math.cos(this.angle)); + this.setAlphaF((float) Math.cos(1.57 * this.particleAge / this.particleMaxAge)); + if (this.particleAge > 40) { + this.setRBGColorF(this.particleRed + (1.0f - this.particleRed) / 10.0f, this.particleGreen + (0.0f - this.particleGreen) / 10.0f, this.particleBlue + (0.0f - this.particleBlue) / 10.0f); + } + } + + @Override + public int getFXLayer() { + return 0; + } + } } diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java b/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java index f6691c57..a02b1ac1 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolaterFX.java @@ -23,33 +23,8 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla if (!this.getUtil().getProcess().isInProgress()) { return; } - BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.4 + 0.2 * rand.nextDouble(), pos.getY() + 1.6, pos.getZ() + 0.4 + rand.nextDouble() * 0.2, 0.0, 0.0, 0.0) { - double axisX = 0.0; - double axisZ = 0.0; - double angle = 0.0; - - { - this.motionX = 0.0; - this.motionZ = 0.0; - this.motionY = -0.012; - this.particleMaxAge = 100; - this.particleGravity = 0.0f; - this.canCollide = true; - this.setRBGColorF(0.8f, 0.4f, 0.0f); - } - - @Override - public void onUpdate() { - super.onUpdate(); - this.angle += 0.06; - this.setAlphaF((float) Math.sin(3.14 * this.particleAge / this.particleMaxAge)); - } - - @Override - public int getFXLayer() { - return 0; - } - }); + final Particle particle = new IsolaterParticleRandomTick(world, pos, rand); + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(particle); } @SideOnly(Side.CLIENT) @@ -57,37 +32,78 @@ public class IsolaterFX extends MachineComponent implements IRender.RandomDispla public void onDisplayTick(World world, BlockPos pos, Random rand) { final int tick = (int) (world.getTotalWorldTime() % 6L); if ((tick == 0 || tick == 5) && this.getUtil().getProcess().isInProgress()) { - BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { - double axisX = this.posX; - double axisZ = this.posZ; - double angle = 0.7 + (int) (this.world.getTotalWorldTime() % 2L) * 3.1415; + final Particle particle = new IsolaterParticle(world, pos); + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(particle); + } + } - { - this.axisX = 0.0; - this.axisZ = 0.0; - this.angle = 0.0; - this.motionX = 0.0; - this.motionZ = 0.0; - this.motionY = 0.012; - this.particleMaxAge = 100; - this.particleGravity = 0.0f; - this.canCollide = true; - this.setRBGColorF(0.8f, 0.0f, 1.0f); - } + @SideOnly(Side.CLIENT) + private static class IsolaterParticleRandomTick extends Particle { + double axisX; + double axisZ; + double angle; - @Override - public void onUpdate() { - super.onUpdate(); - this.angle += 0.06; - this.setPosition(this.axisX + 0.26 * Math.sin(this.angle), this.posY, this.axisZ + 0.26 * Math.cos(this.angle)); - this.setAlphaF((float) Math.cos(1.57 * this.particleAge / this.particleMaxAge)); - } + public IsolaterParticleRandomTick(World world, BlockPos pos, Random rand) { + super(world, pos.getX() + 0.4 + 0.2 * rand.nextDouble(), pos.getY() + 1.6, pos.getZ() + 0.4 + rand.nextDouble() * 0.2, 0.0, 0.0, 0.0); + axisX = 0.0; + axisZ = 0.0; + angle = 0.0; + this.motionX = 0.0; + this.motionZ = 0.0; + this.motionY = -0.012; + this.particleMaxAge = 100; + this.particleGravity = 0.0f; + this.canCollide = true; + this.setRBGColorF(0.8f, 0.4f, 0.0f); + } - @Override - public int getFXLayer() { - return 0; - } - }); + @Override + public void onUpdate() { + super.onUpdate(); + this.angle += 0.06; + this.setAlphaF((float) Math.sin(3.14 * this.particleAge / this.particleMaxAge)); + } + + @Override + public int getFXLayer() { + return 0; + } + } + + @SideOnly(Side.CLIENT) + private static class IsolaterParticle extends Particle { + double axisX; + double axisZ; + double angle; + + public IsolaterParticle(World world, BlockPos pos) { + super(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0); + axisX = this.posX; + axisZ = this.posZ; + angle = 0.7 + (int) (this.world.getTotalWorldTime() % 2L) * 3.1415; + this.axisX = 0.0; + this.axisZ = 0.0; + this.angle = 0.0; + this.motionX = 0.0; + this.motionZ = 0.0; + this.motionY = 0.012; + this.particleMaxAge = 100; + this.particleGravity = 0.0f; + this.canCollide = true; + this.setRBGColorF(0.8f, 0.0f, 1.0f); + } + + @Override + public void onUpdate() { + super.onUpdate(); + this.angle += 0.06; + this.setPosition(this.axisX + 0.26 * Math.sin(this.angle), this.posY, this.axisZ + 0.26 * Math.cos(this.angle)); + this.setAlphaF((float) Math.cos(1.57 * this.particleAge / this.particleMaxAge)); + } + + @Override + public int getFXLayer() { + return 0; } } } diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java index ec01df51..9b432014 100644 --- a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java @@ -22,51 +22,59 @@ public class PolymeriserFX extends MachineComponent implements IRender.DisplayTi public void onDisplayTick(World world, BlockPos pos, Random rand) { final int tick = (int) (world.getTotalWorldTime() % 8L); if ((tick == 0 || tick == 3) && this.getUtil().getProcess().isInProgress()) { - BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.8, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { - double axisX = this.posX; - double axisZ = this.posZ; - double angle = 0.7 + (int) (this.world.getTotalWorldTime() % 2L) * 3.1415; + PolymeriserParticle polymeriserParticle = new PolymeriserParticle(world, pos); + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(polymeriserParticle); + } + } - { - this.axisX = 0.0; - this.axisZ = 0.0; - this.angle = 0.0; - this.motionX = 0.0; - this.motionZ = 0.0; - this.motionY = -0.006; - this.particleMaxAge = 140; - this.particleGravity = 0.0f; - this.canCollide = true; - this.setRBGColorF(0.8f, 0.0f, 1.0f); - } + @SideOnly(Side.CLIENT) + private static class PolymeriserParticle extends Particle { + double axisX; + double axisZ; + double angle; - @Override - public void onUpdate() { - super.onUpdate(); - this.angle += 0.1; - this.motionY = -0.006; - double dist = 0.2; - if (this.particleAge > 60) { - if (this.particleAge > 120) { - dist = 0.1; - } else { - dist = 0.2 - 0.1 * ((this.particleAge - 60.0f) / 60.0f); - } - } - this.setPosition(this.axisX + dist * Math.sin(this.angle), this.posY, this.axisZ + dist * Math.cos(this.angle)); - if (this.particleAge <= 40) { - this.setAlphaF(this.particleAge / 40.0f); - } - if (this.particleAge > 80) { - this.setRBGColorF(this.particleRed + (0.0f - this.particleRed) / 10.0f, this.particleGreen + (1.0f - this.particleGreen) / 10.0f, this.particleBlue + (1.0f - this.particleBlue) / 10.0f); - } - } + public PolymeriserParticle(World world, BlockPos pos) { + super(world, pos.getX() + 0.5, pos.getY() + 1.8, pos.getZ() + 0.5, 0.0, 0.0, 0.0); + axisX = this.posX; + axisZ = this.posZ; + angle = 0.7 + (int) (this.world.getTotalWorldTime() % 2L) * 3.1415; + this.axisX = 0.0; + this.axisZ = 0.0; + this.angle = 0.0; + this.motionX = 0.0; + this.motionZ = 0.0; + this.motionY = -0.006; + this.particleMaxAge = 140; + this.particleGravity = 0.0f; + this.canCollide = true; + this.setRBGColorF(0.8f, 0.0f, 1.0f); + } - @Override - public int getFXLayer() { - return 0; + @Override + public void onUpdate() { + super.onUpdate(); + this.angle += 0.1; + this.motionY = -0.006; + double dist = 0.2; + if (this.particleAge > 60) { + if (this.particleAge > 120) { + dist = 0.1; + } else { + dist = 0.2 - 0.1 * ((this.particleAge - 60.0f) / 60.0f); } - }); + } + this.setPosition(this.axisX + dist * Math.sin(this.angle), this.posY, this.axisZ + dist * Math.cos(this.angle)); + if (this.particleAge <= 40) { + this.setAlphaF(this.particleAge / 40.0f); + } + if (this.particleAge > 80) { + this.setRBGColorF(this.particleRed + (0.0f - this.particleRed) / 10.0f, this.particleGreen + (1.0f - this.particleGreen) / 10.0f, this.particleBlue + (1.0f - this.particleBlue) / 10.0f); + } + } + + @Override + public int getFXLayer() { + return 0; } } } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java index 437f3c5a..5a9024e2 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerFX.java @@ -23,38 +23,8 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl if (!this.getUtil().getProcess().isInProgress()) { return; } - BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.2 + rand.nextDouble() * 0.2, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { - double axisX = this.posX; - double axisZ = this.posZ; - double angle = this.rand.nextDouble() * 2.0 * 3.1415; - - { - this.axisX = 0.0; - this.axisZ = 0.0; - this.angle = 0.0; - this.motionX = 0.0; - this.motionZ = 0.0; - this.motionY = 0.0; - this.particleMaxAge = 200; - this.particleGravity = 0.0f; - this.canCollide = true; - this.setRBGColorF(0.6f + this.rand.nextFloat() * 0.2f, 1.0f, 0.8f * this.rand.nextFloat() * 0.2f); - } - - @Override - public void onUpdate() { - super.onUpdate(); - this.angle += 0.03; - this.setPosition(this.axisX + 0.4 * Math.sin(this.angle), this.posY, this.axisZ + 0.4 * Math.cos(this.angle)); - this.motionY = 0.0; - this.setAlphaF((float) Math.sin(3.14 * this.particleAge / this.particleMaxAge)); - } - - @Override - public int getFXLayer() { - return 0; - } - }); + Particle particle = new SequencerParticleRandomTick(world, pos, rand); + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(particle); } @SideOnly(Side.CLIENT) @@ -62,37 +32,83 @@ public class SequencerFX extends MachineComponent implements IRender.RandomDispl public void onDisplayTick(World world, BlockPos pos, Random rand) { final int ticks = (int) (world.getTotalWorldTime() % 16L); if (ticks == 0 && this.getUtil().getProcess().isInProgress()) { - BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { - double axisX = 0.0; - double axisZ = 0.0; - double angle = 0.0; + Particle particle = new SequencerParticle(world, pos); + BinnieCore.getBinnieProxy().getMinecraftInstance().effectRenderer.addEffect(particle); + } + } - { - this.motionX = 0.0; - this.motionZ = 0.0; - this.motionY = 0.012; - this.particleMaxAge = 50; - this.particleGravity = 0.0f; - this.canCollide = true; - this.particleScale = 2.0f; - //TODO: Add sprites - //this.setParticleIcon((new BinnieIcon[] { Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT })[this.rand.nextInt(4)].getIcon()); - } + @SideOnly(Side.CLIENT) + private static class SequencerParticleRandomTick extends Particle { + double axisX; + double axisZ; + double angle; - @Override - public void onUpdate() { - super.onUpdate(); - this.motionY = 0.012; - if (this.particleAge > 40) { - this.setAlphaF((50 - this.particleAge) / 10.0f); - } - } + public SequencerParticleRandomTick(World world, BlockPos pos, Random rand) { + super(world, pos.getX() + 0.5, pos.getY() + 1.2 + rand.nextDouble() * 0.2, pos.getZ() + 0.5, 0.0, 0.0, 0.0); + axisX = this.posX; + axisZ = this.posZ; + angle = this.rand.nextDouble() * 2.0 * 3.1415; + this.axisX = 0.0; + this.axisZ = 0.0; + this.angle = 0.0; + this.motionX = 0.0; + this.motionZ = 0.0; + this.motionY = 0.0; + this.particleMaxAge = 200; + this.particleGravity = 0.0f; + this.canCollide = true; + this.setRBGColorF(0.6f + this.rand.nextFloat() * 0.2f, 1.0f, 0.8f * this.rand.nextFloat() * 0.2f); + } - @Override - public int getFXLayer() { - return 1; - } - }); + @Override + public void onUpdate() { + super.onUpdate(); + this.angle += 0.03; + this.setPosition(this.axisX + 0.4 * Math.sin(this.angle), this.posY, this.axisZ + 0.4 * Math.cos(this.angle)); + this.motionY = 0.0; + this.setAlphaF((float) Math.sin(3.14 * this.particleAge / this.particleMaxAge)); + } + + @Override + public int getFXLayer() { + return 0; + } + } + + @SideOnly(Side.CLIENT) + private static class SequencerParticle extends Particle { + double axisX; + double axisZ; + double angle; + + public SequencerParticle(World world, BlockPos pos) { + super(world, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5, 0.0, 0.0, 0.0); + axisX = 0.0; + axisZ = 0.0; + angle = 0.0; + this.motionX = 0.0; + this.motionZ = 0.0; + this.motionY = 0.012; + this.particleMaxAge = 50; + this.particleGravity = 0.0f; + this.canCollide = true; + this.particleScale = 2.0f; + //TODO: Add sprites + //this.setParticleIcon((new BinnieIcon[] { Sequencer.fxSeqA, Sequencer.fxSeqG, Sequencer.fxSeqC, Sequencer.fxSeqT })[this.rand.nextInt(4)].getIcon()); + } + + @Override + public void onUpdate() { + super.onUpdate(); + this.motionY = 0.012; + if (this.particleAge > 40) { + this.setAlphaF((50 - this.particleAge) / 10.0f); + } + } + + @Override + public int getFXLayer() { + return 1; } } } diff --git a/src/main/java/binnie/genetics/proxy/ProxyClient.java b/src/main/java/binnie/genetics/proxy/ProxyClient.java index 8e57b25f..56f6a481 100644 --- a/src/main/java/binnie/genetics/proxy/ProxyClient.java +++ b/src/main/java/binnie/genetics/proxy/ProxyClient.java @@ -4,7 +4,10 @@ import binnie.Constants; import binnie.core.models.ModelManager; import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class ProxyClient extends Proxy implements IGeneticsProxy { public static ModelManager modelManager = new ModelManager(Constants.GENETICS_MOD_ID);