diff --git a/src/main/java/net/einsteinsci/betterbeginnings/ModMain.java b/src/main/java/net/einsteinsci/betterbeginnings/ModMain.java index 0e8203c..fa1fe3a 100644 --- a/src/main/java/net/einsteinsci/betterbeginnings/ModMain.java +++ b/src/main/java/net/einsteinsci/betterbeginnings/ModMain.java @@ -47,11 +47,12 @@ public class ModMain @Instance(ModMain.MODID) public static ModMain modInstance; public static Configuration configFile; - public static SimpleNetworkWrapper network; + public BBEventHandler eventHandler = new BBEventHandler(); + @SidedProxy(clientSide = "net.einsteinsci.betterbeginnings.network.ClientProxy", serverSide = "net.einsteinsci.betterbeginnings.network.ServerProxy") public static ServerProxy proxy; - public BBEventHandler eventHandler = new BBEventHandler(); + public static SimpleNetworkWrapper network; public static void LogDebug(String text) { @@ -121,9 +122,6 @@ public class ModMain if (e.getSide() == Side.CLIENT) { RegisterModels.register(); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityInfusionRepair.class, - new InfusionRender(Minecraft.getMinecraft().getRenderManager())); } } diff --git a/src/main/java/net/einsteinsci/betterbeginnings/client/InfusionRender.java b/src/main/java/net/einsteinsci/betterbeginnings/client/InfusionRender.java index 9bd9c2a..368fc03 100644 --- a/src/main/java/net/einsteinsci/betterbeginnings/client/InfusionRender.java +++ b/src/main/java/net/einsteinsci/betterbeginnings/client/InfusionRender.java @@ -7,8 +7,11 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; +@SideOnly(Side.CLIENT) public class InfusionRender extends TileEntitySpecialRenderer { public static final float HOVER_OPACITY = 0.8f; diff --git a/src/main/java/net/einsteinsci/betterbeginnings/network/ClientProxy.java b/src/main/java/net/einsteinsci/betterbeginnings/network/ClientProxy.java index 1055959..5f20625 100644 --- a/src/main/java/net/einsteinsci/betterbeginnings/network/ClientProxy.java +++ b/src/main/java/net/einsteinsci/betterbeginnings/network/ClientProxy.java @@ -1,8 +1,11 @@ package net.einsteinsci.betterbeginnings.network; import net.einsteinsci.betterbeginnings.ModMain; +import net.einsteinsci.betterbeginnings.client.InfusionRender; +import net.einsteinsci.betterbeginnings.tileentity.TileEntityInfusionRepair; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import org.apache.logging.log4j.Level; @@ -11,14 +14,13 @@ public class ClientProxy extends ServerProxy @Override public void registerRenderThings() { - //Campfire - //TileEntitySpecialRenderer renderTool = new RenderCampfire(); - //ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCampfire.class, renderTool); + // nothing here } public void registerTileEntitySpecialRenderer() { - + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityInfusionRepair.class, + new InfusionRender(Minecraft.getMinecraft().getRenderManager())); } @Override diff --git a/src/main/java/net/einsteinsci/betterbeginnings/network/ServerProxy.java b/src/main/java/net/einsteinsci/betterbeginnings/network/ServerProxy.java index 4e04019..bdd6281 100644 --- a/src/main/java/net/einsteinsci/betterbeginnings/network/ServerProxy.java +++ b/src/main/java/net/einsteinsci/betterbeginnings/network/ServerProxy.java @@ -34,7 +34,7 @@ public class ServerProxy case SERVER: return ctx.getServerHandler().playerEntity; default: - ModMain.Log(Level.ERROR, "Invalid side in RepairTableRepairPacket.Handler: " + ctx.side); + ModMain.Log(Level.ERROR, "Invalid side in PacketHandler: " + ctx.side); return null; } }