forked from war-monger/Flan-s-Mod-Plus-War_Monger
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Ultimate' of git://github.com/Unknown025/Flans-Mod-Plus…
… into Unknown025-Ultimate
- Loading branch information
Showing
2 changed files
with
60 additions
and
108 deletions.
There are no files selected for viewing
48 changes: 0 additions & 48 deletions
48
src/main/java/com/flansmod/common/network/PacketGetPlayerClasses.java
This file was deleted.
Oops, something went wrong.
120 changes: 60 additions & 60 deletions
120
src/main/java/com/flansmod/common/network/PacketSendPlayerClasses.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,60 @@ | ||
| package com.flansmod.common.network; | ||
|
|
||
| import com.flansmod.client.gui.GuiTeamSelect; | ||
| import com.flansmod.common.FlansMod; | ||
| import com.flansmod.common.PlayerData; | ||
| import com.flansmod.common.PlayerHandler; | ||
| import com.flansmod.common.driveables.mechas.MechaInventory; | ||
| import com.flansmod.common.teams.PlayerClass; | ||
| import com.flansmod.common.teams.TeamsManager; | ||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.channel.ChannelHandlerContext; | ||
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.entity.player.EntityPlayer; | ||
| import net.minecraft.entity.player.EntityPlayerMP; | ||
| import scala.collection.parallel.ParIterableLike; | ||
|
|
||
| public class PacketSendPlayerClasses extends PacketBase { | ||
| public PlayerClass[] classes; | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public PacketSendPlayerClasses() { | ||
| } | ||
|
|
||
| public PacketSendPlayerClasses(PlayerClass[] classes) { | ||
| this.classes = classes; | ||
| } | ||
|
|
||
| @Override | ||
| public void encodeInto(ChannelHandlerContext ctx, ByteBuf data) { | ||
|
|
||
| data.writeByte(classes.length); | ||
| for (PlayerClass playerClass : classes) { | ||
| writeUTF(data, playerClass.shortName); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void decodeInto(ChannelHandlerContext ctx, ByteBuf data) { | ||
| byte numClasses = data.readByte(); | ||
| classes = new PlayerClass[numClasses]; | ||
| for(int i = 0; i < numClasses; i++) | ||
| { | ||
| classes[i] = PlayerClass.getClass(readUTF(data)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void handleServerSide(EntityPlayerMP playerEntity) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public void handleClientSide(EntityPlayer clientPlayer) { | ||
| Minecraft.getMinecraft().displayGuiScreen(new GuiTeamSelect(classes)); | ||
| } | ||
| } | ||
|
|
||
| package com.flansmod.common.network; | ||
|
|
||
| import com.flansmod.client.gui.GuiTeamSelect; | ||
| import com.flansmod.common.FlansMod; | ||
| import com.flansmod.common.PlayerData; | ||
| import com.flansmod.common.PlayerHandler; | ||
| import com.flansmod.common.driveables.mechas.MechaInventory; | ||
| import com.flansmod.common.teams.PlayerClass; | ||
| import com.flansmod.common.teams.TeamsManager; | ||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.channel.ChannelHandlerContext; | ||
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.entity.player.EntityPlayer; | ||
| import net.minecraft.entity.player.EntityPlayerMP; | ||
| import scala.collection.parallel.ParIterableLike; | ||
|
|
||
| public class PacketSendPlayerClasses extends PacketBase { | ||
| public PlayerClass[] classes; | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public PacketSendPlayerClasses() { | ||
| } | ||
|
|
||
| public PacketSendPlayerClasses(PlayerClass[] classes) { | ||
| this.classes = classes; | ||
| } | ||
|
|
||
| @Override | ||
| public void encodeInto(ChannelHandlerContext ctx, ByteBuf data) { | ||
|
|
||
| data.writeByte(classes.length); | ||
| for (PlayerClass playerClass : classes) { | ||
| writeUTF(data, playerClass.shortName); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void decodeInto(ChannelHandlerContext ctx, ByteBuf data) { | ||
| byte numClasses = data.readByte(); | ||
| classes = new PlayerClass[numClasses]; | ||
| for(int i = 0; i < numClasses; i++) | ||
| { | ||
| classes[i] = PlayerClass.getClass(readUTF(data)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void handleServerSide(EntityPlayerMP playerEntity) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| @SideOnly(Side.CLIENT) | ||
| public void handleClientSide(EntityPlayer clientPlayer) { | ||
| Minecraft.getMinecraft().displayGuiScreen(new GuiTeamSelect(classes)); | ||
| } | ||
| } | ||