lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run formatter

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-08-15 21:30:48 -07:00
parent 61c44a831b
commit 08258fd6ef
606 changed files with 13464 additions and 22975 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java
View file

@ -1,20 +1,18 @@
package WayofTime.bloodmagic.network;
import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.util.ChatUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.relauncher.Side;
import WayofTime.bloodmagic.util.ChatUtil;
public class BloodMagicPacketHandler
{
public class BloodMagicPacketHandler {
public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(BloodMagic.MODID);
public static void init()
{
public static void init() {
INSTANCE.registerMessage(ChatUtil.PacketNoSpamChat.Handler.class, ChatUtil.PacketNoSpamChat.class, 0, Side.CLIENT);
INSTANCE.registerMessage(ItemRouterButtonPacketProcessor.class, ItemRouterButtonPacketProcessor.class, 1, Side.SERVER);
INSTANCE.registerMessage(PlayerVelocityPacketProcessor.class, PlayerVelocityPacketProcessor.class, 2, Side.CLIENT);
@ -25,18 +23,15 @@ public class BloodMagicPacketHandler
INSTANCE.registerMessage(ItemRouterAmountPacketProcessor.class, ItemRouterAmountPacketProcessor.class, 7, Side.SERVER);
}
public static void sendToAllAround(IMessage message, TileEntity te, int range)
{
public static void sendToAllAround(IMessage message, TileEntity te, int range) {
INSTANCE.sendToAllAround(message, new NetworkRegistry.TargetPoint(te.getWorld().provider.getDimension(), te.getPos().getX(), te.getPos().getY(), te.getPos().getZ(), range));
}
public static void sendToAllAround(IMessage message, TileEntity te)
{
public static void sendToAllAround(IMessage message, TileEntity te) {
sendToAllAround(message, te, 64);
}
public static void sendTo(IMessage message, EntityPlayerMP player)
{
public static void sendTo(IMessage message, EntityPlayerMP player) {
INSTANCE.sendTo(message, player);
}
}

42
src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java
View file

@ -1,5 +1,8 @@
package WayofTime.bloodmagic.network;
import WayofTime.bloodmagic.api.soul.DemonWillHolder;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.proxy.ClientProxy;
import io.netty.buffer.ByteBuf;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@ -7,63 +10,48 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import WayofTime.bloodmagic.api.soul.DemonWillHolder;
import WayofTime.bloodmagic.api.soul.EnumDemonWillType;
import WayofTime.bloodmagic.proxy.ClientProxy;
public class DemonAuraPacketProcessor implements IMessage, IMessageHandler<DemonAuraPacketProcessor, IMessage>
{
public class DemonAuraPacketProcessor implements IMessage, IMessageHandler<DemonAuraPacketProcessor, IMessage> {
public DemonWillHolder currentWill = new DemonWillHolder();
public DemonAuraPacketProcessor()
{
public DemonAuraPacketProcessor() {
}
public DemonAuraPacketProcessor(DemonWillHolder holder)
{
public DemonAuraPacketProcessor(DemonWillHolder holder) {
this.currentWill = holder;
}
@Override
public void fromBytes(ByteBuf buffer)
{
public void fromBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
for (EnumDemonWillType type : EnumDemonWillType.values())
{
for (EnumDemonWillType type : EnumDemonWillType.values()) {
currentWill.willMap.put(type, buff.readDouble());
}
}
@Override
public void toBytes(ByteBuf buffer)
{
public void toBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
for (EnumDemonWillType type : EnumDemonWillType.values())
{
if (currentWill.willMap.containsKey(type))
{
for (EnumDemonWillType type : EnumDemonWillType.values()) {
if (currentWill.willMap.containsKey(type)) {
buff.writeDouble(currentWill.willMap.get(type));
} else
{
} else {
buff.writeDouble(0);
}
}
}
@Override
public IMessage onMessage(DemonAuraPacketProcessor message, MessageContext ctx)
{
if (ctx.side == Side.CLIENT)
{
public IMessage onMessage(DemonAuraPacketProcessor message, MessageContext ctx) {
if (ctx.side == Side.CLIENT) {
message.onMessageFromServer();
}
return null;
}
@SideOnly(Side.CLIENT)
public void onMessageFromServer()
{
public void onMessageFromServer() {
ClientProxy.currentAura = currentWill;
}
}

30
src/main/java/WayofTime/bloodmagic/network/ItemRouterAmountPacketProcessor.java
View file

@ -12,20 +12,17 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
public class ItemRouterAmountPacketProcessor implements IMessage, IMessageHandler<ItemRouterAmountPacketProcessor, IMessage>
{
public class ItemRouterAmountPacketProcessor implements IMessage, IMessageHandler<ItemRouterAmountPacketProcessor, IMessage> {
private int ghostItemSlot;
private int amount;
private int dimension;
private BlockPos pos;
public ItemRouterAmountPacketProcessor()
{
public ItemRouterAmountPacketProcessor() {
}
public ItemRouterAmountPacketProcessor(int ghostItemSlot, int amount, BlockPos pos, World world)
{
public ItemRouterAmountPacketProcessor(int ghostItemSlot, int amount, BlockPos pos, World world) {
this.ghostItemSlot = ghostItemSlot;
this.amount = amount;
this.pos = pos;
@ -33,8 +30,7 @@ public class ItemRouterAmountPacketProcessor implements IMessage, IMessageHandle
}
@Override
public void fromBytes(ByteBuf buffer)
{
public void fromBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
dimension = buff.readInt();
pos = buff.readBlockPos();
@ -43,8 +39,7 @@ public class ItemRouterAmountPacketProcessor implements IMessage, IMessageHandle
}
@Override
public void toBytes(ByteBuf buffer)
{
public void toBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
buff.writeInt(dimension);
buff.writeBlockPos(pos);
@ -53,26 +48,21 @@ public class ItemRouterAmountPacketProcessor implements IMessage, IMessageHandle
}
@Override
public IMessage onMessage(ItemRouterAmountPacketProcessor message, MessageContext ctx)
{
if (ctx.side == Side.SERVER)
{
public IMessage onMessage(ItemRouterAmountPacketProcessor message, MessageContext ctx) {
if (ctx.side == Side.SERVER) {
message.onMessageFromClient();
}
return null;
}
public void onMessageFromClient()
{
public void onMessageFromClient() {
World world = DimensionManager.getWorld(dimension);
if (world != null)
{
if (world != null) {
if (!world.isBlockLoaded(pos))
return;
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileFilteredRoutingNode)
{
if (tile instanceof TileFilteredRoutingNode) {
((TileFilteredRoutingNode) tile).setGhostItemAmount(ghostItemSlot, amount);
}
}

42
src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java
View file

@ -12,27 +12,23 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
public class ItemRouterButtonPacketProcessor implements IMessage, IMessageHandler<ItemRouterButtonPacketProcessor, IMessage>
{
public class ItemRouterButtonPacketProcessor implements IMessage, IMessageHandler<ItemRouterButtonPacketProcessor, IMessage> {
private int buttonPress;
private int dimension;
private BlockPos pos;
public ItemRouterButtonPacketProcessor()
{
public ItemRouterButtonPacketProcessor() {
}
public ItemRouterButtonPacketProcessor(int buttonPress, BlockPos pos, World world)
{
public ItemRouterButtonPacketProcessor(int buttonPress, BlockPos pos, World world) {
this.buttonPress = buttonPress;
this.pos = pos;
this.dimension = world.provider.getDimension();
}
@Override
public void fromBytes(ByteBuf buffer)
{
public void fromBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
dimension = buff.readInt();
pos = buff.readBlockPos();
@ -40,8 +36,7 @@ public class ItemRouterButtonPacketProcessor implements IMessage, IMessageHandle
}
@Override
public void toBytes(ByteBuf buffer)
{
public void toBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
buff.writeInt(dimension);
buff.writeBlockPos(pos);
@ -49,37 +44,28 @@ public class ItemRouterButtonPacketProcessor implements IMessage, IMessageHandle
}
@Override
public IMessage onMessage(ItemRouterButtonPacketProcessor message, MessageContext ctx)
{
if (ctx.side == Side.SERVER)
{
public IMessage onMessage(ItemRouterButtonPacketProcessor message, MessageContext ctx) {
if (ctx.side == Side.SERVER) {
message.onMessageFromClient();
}
return null;
}
public void onMessageFromClient()
{
public void onMessageFromClient() {
World world = DimensionManager.getWorld(dimension);
if (world != null)
{
if (world != null) {
if (!world.isBlockLoaded(pos))
return;
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileFilteredRoutingNode)
{
if (buttonPress >= 6)
{
if (buttonPress == 6)
{
if (tile instanceof TileFilteredRoutingNode) {
if (buttonPress >= 6) {
if (buttonPress == 6) {
((TileFilteredRoutingNode) tile).incrementCurrentPriotiryToMaximum(9);
} else if (buttonPress == 7)
{
} else if (buttonPress == 7) {
((TileFilteredRoutingNode) tile).decrementCurrentPriority();
}
} else
{
} else {
((TileFilteredRoutingNode) tile).swapFilters(buttonPress);
}
}

27
src/main/java/WayofTime/bloodmagic/network/KeyProcessor.java
View file

@ -9,47 +9,38 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
public class KeyProcessor implements IMessage, IMessageHandler<KeyProcessor, IMessage>
{
public class KeyProcessor implements IMessage, IMessageHandler<KeyProcessor, IMessage> {
public int keyId;
public boolean showInChat;
public KeyProcessor()
{
public KeyProcessor() {
}
public KeyProcessor(KeyBindings key, boolean showInChat)
{
public KeyProcessor(KeyBindings key, boolean showInChat) {
this.keyId = key.ordinal();
this.showInChat = showInChat;
}
@Override
public void fromBytes(ByteBuf buf)
{
public void fromBytes(ByteBuf buf) {
this.keyId = buf.readInt();
this.showInChat = buf.readBoolean();
}
@Override
public void toBytes(ByteBuf buf)
{
public void toBytes(ByteBuf buf) {
buf.writeInt(this.keyId);
buf.writeBoolean(this.showInChat);
}
@Override
public IMessage onMessage(KeyProcessor msg, MessageContext ctx)
{
public IMessage onMessage(KeyProcessor msg, MessageContext ctx) {
EntityPlayer entityPlayer = ctx.getServerHandler().player;
if (entityPlayer != null)
{
if (entityPlayer != null) {
ItemStack heldStack = entityPlayer.getHeldItemMainhand();
if (heldStack.getItem() instanceof IKeybindable)
{
if (msg.keyId < 0 || msg.keyId >= KeyBindings.values().length)
{
if (heldStack.getItem() instanceof IKeybindable) {
if (msg.keyId < 0 || msg.keyId >= KeyBindings.values().length) {
return null;
}
KeyBindings key = KeyBindings.values()[msg.keyId];

25
src/main/java/WayofTime/bloodmagic/network/PlayerFallDistancePacketProcessor.java
View file

@ -7,48 +7,39 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class PlayerFallDistancePacketProcessor implements IMessage, IMessageHandler<PlayerFallDistancePacketProcessor, IMessage>
{
public class PlayerFallDistancePacketProcessor implements IMessage, IMessageHandler<PlayerFallDistancePacketProcessor, IMessage> {
private float fallDistance;
public PlayerFallDistancePacketProcessor()
{
public PlayerFallDistancePacketProcessor() {
}
public PlayerFallDistancePacketProcessor(float fallDistance)
{
public PlayerFallDistancePacketProcessor(float fallDistance) {
this.fallDistance = fallDistance;
}
@Override
public void fromBytes(ByteBuf buffer)
{
public void fromBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
fallDistance = buff.readFloat();
}
@Override
public void toBytes(ByteBuf buffer)
{
public void toBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
buff.writeFloat(fallDistance);
}
@Override
public IMessage onMessage(PlayerFallDistancePacketProcessor message, MessageContext ctx)
{
if (ctx.side == Side.SERVER)
{
public IMessage onMessage(PlayerFallDistancePacketProcessor message, MessageContext ctx) {
if (ctx.side == Side.SERVER) {
message.onMessageFromClient(ctx.getServerHandler().player);
}
return null;
}
public void onMessageFromClient(EntityPlayer player)
{
public void onMessageFromClient(EntityPlayer player) {
player.fallDistance = fallDistance;
}
}

24
src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java
View file

@ -10,27 +10,23 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class PlayerVelocityPacketProcessor implements IMessage, IMessageHandler<PlayerVelocityPacketProcessor, IMessage>
{
public class PlayerVelocityPacketProcessor implements IMessage, IMessageHandler<PlayerVelocityPacketProcessor, IMessage> {
private double motionX;
private double motionY;
private double motionZ;
public PlayerVelocityPacketProcessor()
{
public PlayerVelocityPacketProcessor() {
}
public PlayerVelocityPacketProcessor(double motionX, double motionY, double motionZ)
{
public PlayerVelocityPacketProcessor(double motionX, double motionY, double motionZ) {
this.motionX = motionX;
this.motionY = motionY;
this.motionZ = motionZ;
}
@Override
public void fromBytes(ByteBuf buffer)
{
public void fromBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
motionX = buff.readDouble();
motionY = buff.readDouble();
@ -38,8 +34,7 @@ public class PlayerVelocityPacketProcessor implements IMessage, IMessageHandler<
}
@Override
public void toBytes(ByteBuf buffer)
{
public void toBytes(ByteBuf buffer) {
PacketBuffer buff = new PacketBuffer(buffer);
buff.writeDouble(motionX);
buff.writeDouble(motionY);
@ -47,18 +42,15 @@ public class PlayerVelocityPacketProcessor implements IMessage, IMessageHandler<
}
@Override
public IMessage onMessage(PlayerVelocityPacketProcessor message, MessageContext ctx)
{
if (ctx.side == Side.CLIENT)
{
public IMessage onMessage(PlayerVelocityPacketProcessor message, MessageContext ctx) {
if (ctx.side == Side.CLIENT) {
message.onMessageFromServer();
}
return null;
}
@SideOnly(Side.CLIENT)
public void onMessageFromServer()
{
public void onMessageFromServer() {
EntityPlayer player = Minecraft.getMinecraft().player;
player.motionX = motionX;
player.motionY = motionY;

24
src/main/java/WayofTime/bloodmagic/network/SigilHoldingPacketProcessor.java
View file

@ -7,47 +7,39 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
public class SigilHoldingPacketProcessor implements IMessage, IMessageHandler<SigilHoldingPacketProcessor, IMessage>
{
public class SigilHoldingPacketProcessor implements IMessage, IMessageHandler<SigilHoldingPacketProcessor, IMessage> {
private int slot;
private int mode;
public SigilHoldingPacketProcessor()
{
public SigilHoldingPacketProcessor() {
}
public SigilHoldingPacketProcessor(int slot, int mode)
{
public SigilHoldingPacketProcessor(int slot, int mode) {
this.slot = slot;
this.mode = mode;
}
@Override
public void toBytes(ByteBuf buffer)
{
public void toBytes(ByteBuf buffer) {
buffer.writeInt(slot);
buffer.writeInt(mode);
}
@Override
public void fromBytes(ByteBuf buffer)
{
public void fromBytes(ByteBuf buffer) {
slot = buffer.readInt();
mode = buffer.readInt();
}
@Override
public IMessage onMessage(SigilHoldingPacketProcessor message, MessageContext ctx)
{
public IMessage onMessage(SigilHoldingPacketProcessor message, MessageContext ctx) {
ItemStack itemStack = ItemStack.EMPTY;
if (message.slot > -1 && message.slot < 9)
{
if (message.slot > -1 && message.slot < 9) {
itemStack = ctx.getServerHandler().player.inventory.getStackInSlot(message.slot);
}
if (!itemStack.isEmpty())
{
if (!itemStack.isEmpty()) {
ItemSigilHolding.cycleToNextSigil(itemStack, message.mode);
}