tilera/auracore
1
0
Fork 0
generated from tilera/1710mod
Code Issues 3 Pull requests Packages Projects Releases Wiki Activity

fix: move packet registration back to main class
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Timo Ley 2023-01-08 13:52:59 +01:00
parent e8e7cc6e13
commit 09e78be65d
6 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/dev/tilera/auracore/AuraCore.java
View file

@ -11,6 +11,7 @@ import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import dev.tilera.auracore.api.Aspects; import dev.tilera.auracore.api.Aspects;
import dev.tilera.auracore.aura.AuraCalculationThread; import dev.tilera.auracore.aura.AuraCalculationThread;
import dev.tilera.auracore.aura.AuraDeleteThread; import dev.tilera.auracore.aura.AuraDeleteThread;
@ -19,6 +20,14 @@ import dev.tilera.auracore.aura.AuraUpdateThread;
import dev.tilera.auracore.aura.AuraWorldTicker; import dev.tilera.auracore.aura.AuraWorldTicker;
import dev.tilera.auracore.client.GUITicker; import dev.tilera.auracore.client.GUITicker;
import dev.tilera.auracore.client.RenderEventHandler; import dev.tilera.auracore.client.RenderEventHandler;
import dev.tilera.auracore.network.AuraDeletePacket;
import dev.tilera.auracore.network.AuraDeletePacketHandler;
import dev.tilera.auracore.network.AuraPacket;
import dev.tilera.auracore.network.AuraPacketHandler;
import dev.tilera.auracore.network.AuraTransferFXPacket;
import dev.tilera.auracore.network.AuraTransferFXPacketHandler;
import dev.tilera.auracore.network.NodeZapPacket;
import dev.tilera.auracore.network.NodeZapPacketHandler;
import dev.tilera.auracore.proxy.CommonProxy; import dev.tilera.auracore.proxy.CommonProxy;
import dev.tilera.auracore.world.WorldGenerator; import dev.tilera.auracore.world.WorldGenerator;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -43,6 +52,11 @@ public class AuraCore {
Config.load(); Config.load();
Aspects.load(); Aspects.load();
CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel("auracore"); CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel("auracore");
int pktID = 0;
AuraCore.CHANNEL.registerMessage(AuraPacketHandler.class, AuraPacket.class, pktID++, Side.CLIENT);
AuraCore.CHANNEL.registerMessage(AuraDeletePacketHandler.class, AuraDeletePacket.class, pktID++, Side.CLIENT);
AuraCore.CHANNEL.registerMessage(AuraTransferFXPacketHandler.class, AuraTransferFXPacket.class, pktID++, Side.CLIENT);
AuraCore.CHANNEL.registerMessage(NodeZapPacketHandler.class, NodeZapPacket.class, pktID++, Side.CLIENT);
proxy.preInit(); proxy.preInit();
MinecraftForge.EVENT_BUS.register(new EventHandler()); MinecraftForge.EVENT_BUS.register(new EventHandler());
MinecraftForge.EVENT_BUS.register(new RenderEventHandler()); MinecraftForge.EVENT_BUS.register(new RenderEventHandler());

3
src/main/java/dev/tilera/auracore/network/AuraDeletePacketHandler.java
View file

@ -3,10 +3,13 @@ package dev.tilera.auracore.network;
import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dev.tilera.auracore.client.AuraManagerClient; import dev.tilera.auracore.client.AuraManagerClient;
public class AuraDeletePacketHandler implements IMessageHandler<AuraDeletePacket, IMessage> { public class AuraDeletePacketHandler implements IMessageHandler<AuraDeletePacket, IMessage> {
@SideOnly(Side.CLIENT)
@Override @Override
public IMessage onMessage(AuraDeletePacket message, MessageContext ctx) { public IMessage onMessage(AuraDeletePacket message, MessageContext ctx) {
AuraManagerClient.auraClientList.remove(message.key); AuraManagerClient.auraClientList.remove(message.key);

3
src/main/java/dev/tilera/auracore/network/AuraPacketHandler.java
View file

@ -4,6 +4,8 @@ import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dev.tilera.auracore.client.AuraManagerClient; import dev.tilera.auracore.client.AuraManagerClient;
import dev.tilera.auracore.client.AuraManagerClient.NodeHistoryStats; import dev.tilera.auracore.client.AuraManagerClient.NodeHistoryStats;
import dev.tilera.auracore.client.AuraManagerClient.NodeStats; import dev.tilera.auracore.client.AuraManagerClient.NodeStats;
@ -11,6 +13,7 @@ import net.minecraft.world.World;
public class AuraPacketHandler implements IMessageHandler<AuraPacket, IMessage> { public class AuraPacketHandler implements IMessageHandler<AuraPacket, IMessage> {
@SideOnly(Side.CLIENT)
@Override @Override
public IMessage onMessage(AuraPacket message, MessageContext ctx) { public IMessage onMessage(AuraPacket message, MessageContext ctx) {
World world = FMLClientHandler.instance().getWorldClient(); World world = FMLClientHandler.instance().getWorldClient();

3
src/main/java/dev/tilera/auracore/network/AuraTransferFXPacketHandler.java
View file

@ -4,6 +4,8 @@ import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dev.tilera.auracore.client.FXSparkle; import dev.tilera.auracore.client.FXSparkle;
import dev.tilera.auracore.helper.Utils; import dev.tilera.auracore.helper.Utils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -11,6 +13,7 @@ import net.minecraft.util.MathHelper;
public class AuraTransferFXPacketHandler implements IMessageHandler<AuraTransferFXPacket, IMessage> { public class AuraTransferFXPacketHandler implements IMessageHandler<AuraTransferFXPacket, IMessage> {
@SideOnly(Side.CLIENT)
@Override @Override
public IMessage onMessage(AuraTransferFXPacket message, MessageContext ctx) { public IMessage onMessage(AuraTransferFXPacket message, MessageContext ctx) {
EntityPlayer player = FMLClientHandler.instance().getClientPlayerEntity(); EntityPlayer player = FMLClientHandler.instance().getClientPlayerEntity();

3
src/main/java/dev/tilera/auracore/network/NodeZapPacketHandler.java
View file

@ -3,6 +3,8 @@ package dev.tilera.auracore.network;
import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -10,6 +12,7 @@ import thaumcraft.client.fx.bolt.FXLightningBolt;
public class NodeZapPacketHandler implements IMessageHandler<NodeZapPacket, IMessage> { public class NodeZapPacketHandler implements IMessageHandler<NodeZapPacket, IMessage> {
@SideOnly(Side.CLIENT)
@Override @Override
public IMessage onMessage(NodeZapPacket message, MessageContext ctx) { public IMessage onMessage(NodeZapPacket message, MessageContext ctx) {
World world = Minecraft.getMinecraft().theWorld; World world = Minecraft.getMinecraft().theWorld;

20
src/main/java/dev/tilera/auracore/proxy/ClientProxy.java
View file

@ -1,31 +1,11 @@
package dev.tilera.auracore.proxy; package dev.tilera.auracore.proxy;
import cpw.mods.fml.relauncher.Side;
import dev.tilera.auracore.AuraCore;
import dev.tilera.auracore.client.gui.GuiArcaneWorkbench; import dev.tilera.auracore.client.gui.GuiArcaneWorkbench;
import dev.tilera.auracore.network.AuraDeletePacket;
import dev.tilera.auracore.network.AuraDeletePacketHandler;
import dev.tilera.auracore.network.AuraPacket;
import dev.tilera.auracore.network.AuraPacketHandler;
import dev.tilera.auracore.network.AuraTransferFXPacket;
import dev.tilera.auracore.network.AuraTransferFXPacketHandler;
import dev.tilera.auracore.network.NodeZapPacket;
import dev.tilera.auracore.network.NodeZapPacketHandler;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World; import net.minecraft.world.World;
import thaumcraft.common.tiles.TileArcaneWorkbench; import thaumcraft.common.tiles.TileArcaneWorkbench;
public class ClientProxy extends CommonProxy { public class ClientProxy extends CommonProxy {
@Override
public void preInit() {
int pktID = 0;
AuraCore.CHANNEL.registerMessage(AuraPacketHandler.class, AuraPacket.class, pktID++, Side.CLIENT);
AuraCore.CHANNEL.registerMessage(AuraDeletePacketHandler.class, AuraDeletePacket.class, pktID++, Side.CLIENT);
AuraCore.CHANNEL.registerMessage(AuraTransferFXPacketHandler.class, AuraTransferFXPacket.class, pktID++, Side.CLIENT);
AuraCore.CHANNEL.registerMessage(NodeZapPacketHandler.class, NodeZapPacket.class, pktID++, Side.CLIENT);
super.preInit();
}
@Override @Override
public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) {