mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 04:32:24 +00:00
Change recieve -> receive (#67)
This commit is contained in:
1 parent
311d618d53
commit
7ffa516892
17 files changed
+38
-38
No files matched your search
@@ -91,7 +91,7 @@ public interface IWidget {
|
||||
|
||||
void callEvent(Event event);
|
||||
|
||||
void recieveEvent(Event event);
|
||||
void receiveEvent(Event event);
|
||||
|
||||
void onUpdateClient();
|
||||
|
||||
|
||||
@@ -235,11 +235,11 @@ public class Widget implements IWidget {
|
||||
|
||||
@Override
|
||||
public void callEvent(Event event) {
|
||||
getSuperParent().recieveEvent(event);
|
||||
getSuperParent().receiveEvent(event);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveEvent(Event event) {
|
||||
public void receiveEvent(Event event) {
|
||||
for (EventHandler handler : globalEventHandlers) {
|
||||
if (handler.handles(event)) {
|
||||
handler.onEvent(event);
|
||||
@@ -248,7 +248,7 @@ public class Widget implements IWidget {
|
||||
|
||||
try {
|
||||
for (IWidget child : getWidgets()) {
|
||||
child.recieveEvent(event);
|
||||
child.receiveEvent(event);
|
||||
}
|
||||
} catch (ConcurrentModificationException e) {
|
||||
// ignored
|
||||
|
||||
@@ -285,8 +285,8 @@ public class WindowFieldKit extends Window {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
super.recieveGuiNBT(side, player, name, nbt);
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
super.receiveGuiNBT(side, player, name, nbt);
|
||||
if (side != Side.SERVER || !name.equals("analyse")) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -175,8 +175,8 @@ public class WindowGenesis extends Window {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
super.recieveGuiNBT(side, player, name, nbt);
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
super.receiveGuiNBT(side, player, name, nbt);
|
||||
if (side == Side.SERVER && name.equals("genesis")) {
|
||||
ItemStack stack = ItemStack.loadItemStackFromNBT(nbt);
|
||||
InventoryPlayer playerInv = player.inventory;
|
||||
|
||||
@@ -250,7 +250,7 @@ public class ContainerCraftGUI extends Container {
|
||||
} else if (name.equals("mouse-over-slot")) {
|
||||
onMouseOverSlot(player, action);
|
||||
} else if (name.equals("shift-click-info")) {
|
||||
onRecieveShiftClickHighlights(player, action);
|
||||
onReceiveShiftClickHighlights(player, action);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -441,7 +441,7 @@ public class ContainerCraftGUI extends Container {
|
||||
syncedNBT.put("shift-click-info", nbt);
|
||||
}
|
||||
|
||||
private void onRecieveShiftClickHighlights(EntityPlayer player, NBTTagCompound data) {
|
||||
private void onReceiveShiftClickHighlights(EntityPlayer player, NBTTagCompound data) {
|
||||
ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).clear();
|
||||
for (int slotnumber : data.getIntArray("slots")) {
|
||||
ControlSlot.highlighting.get(EnumHighlighting.SHIFT_CLICK).add(slotnumber);
|
||||
@@ -458,16 +458,16 @@ public class ContainerCraftGUI extends Container {
|
||||
return null;
|
||||
}
|
||||
|
||||
public void recieveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
|
||||
public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
|
||||
String name = action.getString("type");
|
||||
if (handleNBT(side, player, name, action)) {
|
||||
return;
|
||||
}
|
||||
|
||||
window.recieveGuiNBT(getSide(), player, name, action);
|
||||
INetwork.RecieveGuiNBT machine = Machine.getInterface(INetwork.RecieveGuiNBT.class, window.getInventory());
|
||||
window.receiveGuiNBT(getSide(), player, name, action);
|
||||
INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory());
|
||||
if (machine != null) {
|
||||
machine.recieveGuiNBT(getSide(), player, name, action);
|
||||
machine.receiveGuiNBT(getSide(), player, name, action);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ import binnie.core.resource.ResourceType;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public abstract class Window extends TopLevelWidget implements INetwork.RecieveGuiNBT {
|
||||
public abstract class Window extends TopLevelWidget implements INetwork.ReceiveGuiNBT {
|
||||
|
||||
protected float titleButtonLeft;
|
||||
protected float titleButtonRight;
|
||||
@@ -291,7 +291,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
if (side == Side.CLIENT && name.equals("username")) {
|
||||
float w = w();
|
||||
float titleButtonRight = this.titleButtonRight + 16.0f;
|
||||
|
||||
@@ -277,16 +277,16 @@ public class Machine implements INetworkedEntity, INBTTagable, INetwork.TilePack
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
for (INetwork.RecieveGuiNBT recieve : getInterfaces(INetwork.RecieveGuiNBT.class)) {
|
||||
recieve.recieveGuiNBT(side, player, name, nbt);
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
for (INetwork.ReceiveGuiNBT receive : getInterfaces(INetwork.ReceiveGuiNBT.class)) {
|
||||
receive.receiveGuiNBT(side, player, name, nbt);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendGuiNBT(Map<String, NBTTagCompound> nbts) {
|
||||
for (INetwork.SendGuiNBT recieve : getInterfaces(INetwork.SendGuiNBT.class)) {
|
||||
recieve.sendGuiNBT(nbts);
|
||||
for (INetwork.SendGuiNBT receive : getInterfaces(INetwork.SendGuiNBT.class)) {
|
||||
receive.sendGuiNBT(nbts);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -50,7 +50,7 @@ public class MachineComponent implements INBTTagable {
|
||||
return new MachinePayload(Binnie.Machine.getNetworkID(getClass()));
|
||||
}
|
||||
|
||||
public void recieveData(MachinePayload payload) {}
|
||||
public void receiveData(MachinePayload payload) {}
|
||||
|
||||
public MachineUtil getUtil() {
|
||||
return getMachine().getMachineUtil();
|
||||
|
||||
@@ -49,7 +49,7 @@ public class ComponentChargedSlots extends MachineComponent implements INetwork.
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
if (!name.equals("slot-charges")) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -21,11 +21,11 @@ public interface INetwork {
|
||||
void syncFromNBT(NBTTagCompound nbt);
|
||||
}
|
||||
|
||||
interface RecieveGuiNBT {
|
||||
interface ReceiveGuiNBT {
|
||||
|
||||
void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt);
|
||||
void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt);
|
||||
}
|
||||
|
||||
interface GuiNBT extends RecieveGuiNBT, SendGuiNBT {
|
||||
interface GuiNBT extends ReceiveGuiNBT, SendGuiNBT {
|
||||
}
|
||||
}
|
||||
@@ -69,7 +69,7 @@ class ComponentCompartmentInventory extends ComponentInventorySlots implements I
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
if (name.equals("comp-tabs")) {
|
||||
NBTTagList tags = nbt.getTagList("tabs", 10);
|
||||
for (int i = 0; i < tags.tagCount(); ++i) {
|
||||
|
||||
@@ -496,8 +496,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
super.recieveGuiNBT(side, player, name, nbt);
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
super.receiveGuiNBT(side, player, name, nbt);
|
||||
if (name.equals("tab-change")) {
|
||||
currentTab = nbt.getByte("i");
|
||||
}
|
||||
|
||||
@@ -64,14 +64,14 @@ public enum BinnieCorePacketID implements IPacketID {
|
||||
final EntityPlayer player = BinnieCore.proxy.getPlayer();
|
||||
|
||||
if (player.openContainer instanceof ContainerCraftGUI gui) {
|
||||
gui.recieveNBT(Side.CLIENT, player, tagCompound);
|
||||
gui.receiveNBT(Side.CLIENT, player, tagCompound);
|
||||
}
|
||||
} else {
|
||||
if (context.netHandler instanceof NetHandlerPlayServer server) {
|
||||
final EntityPlayer player = server.playerEntity;
|
||||
|
||||
if (player.openContainer instanceof ContainerCraftGUI gui) {
|
||||
gui.recieveNBT(Side.SERVER, player, tagCompound);
|
||||
gui.receiveNBT(Side.SERVER, player, tagCompound);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -48,8 +48,8 @@ public class TransmissionModifierComponent extends ComponentBeeModifier implemen
|
||||
}
|
||||
|
||||
for (IEnergyHandler handler : handlers) {
|
||||
int recieved = handler.receiveEnergy(ForgeDirection.NORTH, output, false);
|
||||
getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -recieved, false);
|
||||
int received = handler.receiveEnergy(ForgeDirection.NORTH, output, false);
|
||||
getUtil().getPoweredMachine().receiveEnergy(ForgeDirection.NORTH, -received, false);
|
||||
energy = getUtil().getPoweredMachine().getEnergyStored(ForgeDirection.NORTH);
|
||||
if (energy <= 0) {
|
||||
return;
|
||||
|
||||
@@ -93,7 +93,7 @@ public class WoodworkerRecipeComponent extends ComponentRecipe
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
if (name.equals("recipe")) {
|
||||
InventoryPlayer playerInv = player.inventory;
|
||||
ItemStack recipe = doRecipe(false);
|
||||
|
||||
@@ -55,8 +55,8 @@ public class WindowGeneBank extends WindowMachine {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
super.recieveGuiNBT(side, player, name, nbt);
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
super.receiveGuiNBT(side, player, name, nbt);
|
||||
if (side != Side.SERVER || !name.equals("gene-select")) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -49,13 +49,13 @@ public class WindowSequencer extends WindowMachine {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void recieveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
public void receiveGuiNBT(Side side, EntityPlayer player, String name, NBTTagCompound nbt) {
|
||||
if (side == Side.CLIENT && name.equals("username")) {
|
||||
slotText.setValue(
|
||||
EnumChatFormatting.DARK_GRAY
|
||||
+ I18N.localise("genetics.machine.sequencer.gui.sequensedBy", nbt.getString("username")));
|
||||
}
|
||||
super.recieveGuiNBT(side, player, name, nbt);
|
||||
super.receiveGuiNBT(side, player, name, nbt);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user