Skip to content

Commit

Permalink
Moved files around to match the rest of my mods (this is the only mod…
Browse files Browse the repository at this point in the history
… that doesn't follow my general file structure).

Added EventCalendar.class to check for events on init. To be used for easter eggs.
  • Loading branch information
iChun committed Apr 9, 2014
1 parent d824532 commit c571bb3
Show file tree
Hide file tree
Showing 21 changed files with 103 additions and 45 deletions.
5 changes: 3 additions & 2 deletions src/main/java/ichun/client/core/ClientProxy.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package ichun.client.core;

import ichun.core.CommonProxy;
import ichun.core.util.ResourceHelper;
import ichun.common.core.CommonProxy;
import ichun.common.core.util.ResourceHelper;

public class ClientProxy extends CommonProxy
{

@Override
public void init()
{
super.init();
ResourceHelper.init();
}
}
5 changes: 1 addition & 4 deletions src/main/java/ichun/client/core/TickHandlerClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,14 @@
import cpw.mods.fml.common.gameevent.TickEvent;
import ichun.client.gui.config.GuiConfigBase;
import ichun.client.gui.config.GuiConfigSetter;
import ichun.client.render.RendererHelper;
import ichun.core.config.ConfigHandler;
import ichun.common.core.config.ConfigHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.client.gui.GuiOptions;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;

//TODO check all the tick handlers for world and player ticks to make sure that the side is only called on server/client. Done: BackTools
public class TickHandlerClient
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ichun/client/gui/config/GuiConfigBase.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ichun.client.gui.config;

import ichun.core.config.Config;
import ichun.common.core.config.Config;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiControls;
import net.minecraft.client.gui.GuiScreen;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ichun.client.gui.config;

import cpw.mods.fml.client.FMLClientHandler;
import ichun.core.config.Config;
import ichun.core.config.ConfigHandler;
import ichun.common.core.config.Config;
import ichun.common.core.config.ConfigHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.PositionedSoundRecord;
import net.minecraft.client.gui.GuiSlot;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ichun/client/gui/config/GuiConfigSetter.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ichun.client.gui.config;

import ichun.core.config.Config;
import ichun.common.core.config.Config;

import java.util.ArrayList;
import java.util.Iterator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ichun.client.gui.config;

import ichun.core.config.Config;
import ichun.common.core.config.Config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiSlot;
Expand Down Expand Up @@ -48,7 +48,7 @@ public GuiConfigSetterScroll(GuiConfigSetter guiConfigSetter, Config cfg, ArrayL
textDummy = new GuiTextField(Minecraft.getMinecraft().fontRenderer, controls.width, controls.height, 150, 20);
textDummy.setVisible(false);
textDummy.setMaxStringLength(7);

propNames = new ArrayList<String>();

for(Property p : properties)
Expand Down Expand Up @@ -102,7 +102,7 @@ protected void elementClicked(int i, boolean flag, int mouseX, int mouseY)
else
{
textDummy.setMaxStringLength(7);

intArrayList.clear();
nestedIntArrayList.clear();

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ichun/client/model/ModelHelper.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ichun.client.model;

import ichun.core.util.ObfHelper;
import ichun.common.core.util.ObfHelper;

import java.lang.reflect.Field;
import java.util.ArrayList;
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/ichun/common/core/CommonProxy.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package ichun.common.core;

public class CommonProxy
{
public void init()
{
EventCalendar.checkDate();
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ichun.core;
package ichun.common.core;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ichun.core.util.ObfHelper;
import ichun.common.core.util.ObfHelper;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
Expand All @@ -12,8 +12,6 @@
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.Item;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
Expand All @@ -22,9 +20,6 @@
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.List;

Expand Down
62 changes: 62 additions & 0 deletions src/main/java/ichun/common/core/EventCalendar.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package ichun.common.core;

import java.util.Calendar;

public class EventCalendar
{
public static boolean isNewYear; //1/1
public static boolean isPgBirthday; //9/3
public static boolean isAFDay; //1/4
public static boolean isHalloween; //31/10
public static boolean isChristmas; //25/12

public static void checkDate()
{
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis());

switch(calendar.get(2)) //month
{
case 1:
{
if(calendar.get(5) == 1)
{
isNewYear = true;
}
break;
}
case 3:
{
if(calendar.get(5) == 9) //day
{
isPgBirthday = true;
}
break;
}
case 4:
{
if(calendar.get(5) == 1)
{
isAFDay = true;
}
break;
}
case 10:
{
if(calendar.get(5) == 31)
{
isHalloween = true;
}
break;
}
case 12:
{
if(calendar.get(5) == 25)
{
isChristmas = true;
}
break;
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ichun.core.config;
package ichun.common.core.config;


import net.minecraftforge.common.config.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ichun.core.config;
package ichun.common.core.config;

import net.minecraftforge.common.config.Configuration;
import org.apache.logging.log4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ichun.core.config;
package ichun.common.core.config;

import net.minecraftforge.common.config.Property;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ichun.core.network;
package ichun.common.core.network;

import cpw.mods.fml.relauncher.Side;
import io.netty.buffer.ByteBuf;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package ichun.core.network;
package ichun.common.core.network;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ichun.core.iChunUtil;
import ichun.common.iChunUtil;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.client.Minecraft;
Expand All @@ -14,7 +14,6 @@
import net.minecraft.network.NetHandlerPlayServer;

import java.util.ArrayList;
import java.util.Collections;

public class ChannelHandler extends FMLIndexedMessageToMessageCodec<AbstractPacket>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ichun.core.network;
package ichun.common.core.network;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.FMLEmbeddedChannel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package ichun.core.util;
package ichun.common.core.util;

/*
* Taken from http://www.rgagnon.com/javadetails/java-0416.html
* and http://www.rgagnon.com/javadetails/java-0596.html
* Modified for use. Thanks!
*/

import ichun.core.iChunUtil;
import ichun.common.iChunUtil;

import java.io.File;
import java.io.FileInputStream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package ichun.core.util;
package ichun.common.core.util;

import java.lang.reflect.Field;
import java.lang.reflect.Method;

import ichun.core.iChunUtil;
import ichun.common.iChunUtil;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RendererLivingEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ichun.core.util;
package ichun.common.core.util;

import java.io.File;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ichun.core;
package ichun.common;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
Expand All @@ -11,9 +11,10 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ichun.client.core.TickHandlerClient;
import ichun.core.config.Config;
import ichun.core.config.ConfigHandler;
import ichun.core.util.ObfHelper;
import ichun.common.core.CommonProxy;
import ichun.common.core.config.Config;
import ichun.common.core.config.ConfigHandler;
import ichun.common.core.util.ObfHelper;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import org.apache.logging.log4j.Level;
Expand All @@ -37,7 +38,7 @@ public class iChunUtil
@Instance("iChunUtil")
public static iChunUtil instance;

@SidedProxy(clientSide = "ichun.client.core.ClientProxy", serverSide = "ichun.core.CommonProxy")
@SidedProxy(clientSide = "ichun.client.core.ClientProxy", serverSide = "ichun.common.core.CommonProxy")
public static CommonProxy proxy;

public static TickHandlerClient tickHandlerClient;
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/ichun/core/CommonProxy.java

This file was deleted.

0 comments on commit c571bb3

Please sign in to comment.