diff --git a/gradle.properties b/gradle.properties index e172953..4c6558f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ minecraft_version=1.7.10 -forge_version=10.13.3.1403 -NEI_version=1.0.4.90 +forge_version=10.13.4.1481 +NEI_version=1.0.5.111 mod_version=0.0.1 diff --git a/src/main/java/com/enderio/core/EnderCore.java b/src/main/java/com/enderio/core/EnderCore.java index b50608f..0c535c9 100644 --- a/src/main/java/com/enderio/core/EnderCore.java +++ b/src/main/java/com/enderio/core/EnderCore.java @@ -24,6 +24,7 @@ import com.enderio.core.common.config.ConfigHandler; import com.enderio.core.common.enchant.EnchantAutoSmelt; import com.enderio.core.common.enchant.EnchantXPBoost; import com.enderio.core.common.imc.IMCRegistry; +import com.enderio.core.common.network.EnderPacketHandler; import com.enderio.core.common.util.EnderFileUtils; import com.enderio.core.common.util.PermanentCache; import com.enderio.core.common.util.TextureErrorRemover; @@ -92,6 +93,8 @@ public class EnderCore implements IEnderMod { @EventHandler public void init(FMLInitializationEvent event) { + EnderPacketHandler.init(); + for (IConfigHandler c : configs) { c.initHook(); } diff --git a/src/main/java/com/enderio/core/common/TileEntityEnder.java b/src/main/java/com/enderio/core/common/TileEntityEnder.java index d06da8f..31dc452 100644 --- a/src/main/java/com/enderio/core/common/TileEntityEnder.java +++ b/src/main/java/com/enderio/core/common/TileEntityEnder.java @@ -16,7 +16,7 @@ import com.enderio.core.common.util.Util; public abstract class TileEntityEnder extends TileEntity { private final int checkOffset = (int) (Math.random() * 20); - private final boolean isProgressTile; + protected final boolean isProgressTile; protected int lastProgressScaled = -1; protected int ticksSinceLastProgressUpdate; diff --git a/src/main/java/com/enderio/core/common/network/EnderPacketHandler.java b/src/main/java/com/enderio/core/common/network/EnderPacketHandler.java index 3165dd5..1f7c8b7 100644 --- a/src/main/java/com/enderio/core/common/network/EnderPacketHandler.java +++ b/src/main/java/com/enderio/core/common/network/EnderPacketHandler.java @@ -12,9 +12,10 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; public class EnderPacketHandler { + public static final SimpleNetworkWrapper INSTANCE = new SimpleNetworkWrapper(EnderCore.NAME); - static { + public static void init() { INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, 0, Side.CLIENT); INSTANCE.registerMessage(PacketProgress.class, PacketProgress.class, 1, Side.CLIENT); } diff --git a/src/main/java/com/enderio/core/common/network/MessageTileEntity.java b/src/main/java/com/enderio/core/common/network/MessageTileEntity.java index b832039..3e335a8 100644 --- a/src/main/java/com/enderio/core/common/network/MessageTileEntity.java +++ b/src/main/java/com/enderio/core/common/network/MessageTileEntity.java @@ -16,7 +16,7 @@ public abstract class MessageTileEntity implements IMessag protected int y; protected int z; - private Class tileClass; + protected Class tileClass; protected MessageTileEntity() { } diff --git a/src/main/java/com/enderio/core/common/network/PacketProgress.java b/src/main/java/com/enderio/core/common/network/PacketProgress.java index ec32dd8..ec631ad 100644 --- a/src/main/java/com/enderio/core/common/network/PacketProgress.java +++ b/src/main/java/com/enderio/core/common/network/PacketProgress.java @@ -10,7 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -public class PacketProgress extends MessageTileEntity implements IMessageHandler { +public class PacketProgress extends MessageTileEntity implements IMessageHandler { private float progress; @@ -40,7 +40,7 @@ public class PacketProgress extends MessageTileEntity implements IMe @Override public IMessage onMessage(PacketProgress message, MessageContext ctx) { TileEntity tile = message.getTileEntity(EnderCore.proxy.getClientWorld()); - if(tile instanceof IProgressTile) { + if (tile instanceof IProgressTile) { ((IProgressTile) tile).setProgress(message.progress); } return null;