Restructuring package structure

This commit is contained in:
pahimar 2013-12-17 15:48:21 -05:00
parent d346895154
commit 2a7b760398
49 changed files with 86 additions and 93 deletions

View file

@ -4,18 +4,18 @@ import com.pahimar.ee3.addon.AddonHandler;
import com.pahimar.ee3.block.ModBlocks;
import com.pahimar.ee3.command.CommandHandler;
import com.pahimar.ee3.configuration.ConfigurationHandler;
import com.pahimar.ee3.core.handler.*;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.core.helper.VersionHelper;
import com.pahimar.ee3.core.proxy.CommonProxy;
import com.pahimar.ee3.creativetab.CreativeTabEE3;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.handler.*;
import com.pahimar.ee3.helper.LogHelper;
import com.pahimar.ee3.helper.VersionHelper;
import com.pahimar.ee3.imc.InterModCommsHandler;
import com.pahimar.ee3.item.ModItems;
import com.pahimar.ee3.item.crafting.RecipesAlchemicalBagDyes;
import com.pahimar.ee3.lib.Reference;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.network.PacketHandler;
import com.pahimar.ee3.proxy.CommonProxy;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;

View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.addon;
import com.pahimar.ee3.api.RecipeMapping;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.emc.EmcValue;
import com.pahimar.ee3.helper.LogHelper;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.item.WrappedStack;
import net.minecraft.block.Block;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.client.audio;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.helper.LogHelper;
import com.pahimar.ee3.lib.Sounds;
import net.minecraftforge.client.event.sound.SoundLoadEvent;
import net.minecraftforge.event.ForgeSubscribe;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.client.gui.inventory;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.inventory.ContainerAlchemicalBag;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.lib.Textures;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.client.gui.inventory;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.inventory.ContainerPortableCrafting;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.lib.Textures;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.client.gui.inventory;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.lib.Textures;
import cpw.mods.fml.relauncher.Side;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.core.helper.VersionHelper;
import com.pahimar.ee3.helper.VersionHelper;
import com.pahimar.ee3.lib.Commands;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.WrongUsageException;

View file

@ -1,9 +1,9 @@
package com.pahimar.ee3.emc;
import com.google.common.collect.ImmutableSortedMap;
import com.pahimar.ee3.core.helper.EmcHelper;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.core.helper.RecipeHelper;
import com.pahimar.ee3.helper.EmcHelper;
import com.pahimar.ee3.helper.LogHelper;
import com.pahimar.ee3.helper.RecipeHelper;
import com.pahimar.ee3.item.OreStack;
import com.pahimar.ee3.item.WrappedStack;
import com.pahimar.ee3.item.crafting.RecipeRegistry;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.event.ActionRequestEvent;
import net.minecraftforge.event.ForgeSubscribe;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.common.ICraftingHandler;
import net.minecraft.entity.player.EntityPlayer;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.helper.TransmutationHelper;
import com.pahimar.ee3.item.IChargeable;
import com.pahimar.ee3.item.ITransmutationStone;
import com.pahimar.ee3.lib.Textures;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.helper.ItemHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraftforge.event.ForgeSubscribe;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.core.helper.GeneralHelper;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.helper.GeneralHelper;
import com.pahimar.ee3.helper.LogHelper;
import net.minecraft.item.ItemStack;
import java.util.ArrayList;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.lib.Strings;
import net.minecraft.entity.item.EntityItem;
import net.minecraftforge.event.ForgeSubscribe;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.emc.EmcType;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.core.helper.KeyBindingHelper;
import com.pahimar.ee3.helper.KeyBindingHelper;
import com.pahimar.ee3.item.IKeyBound;
import com.pahimar.ee3.lib.Reference;
import com.pahimar.ee3.network.PacketTypeHandler;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;

View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.client.renderer.RenderUtils;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.helper.TransmutationHelper;
import com.pahimar.ee3.item.ITransmutationStone;
import com.pahimar.ee3.lib.Reference;
import cpw.mods.fml.client.FMLClientHandler;

View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.configuration.GeneralConfiguration;
import com.pahimar.ee3.core.helper.VersionHelper;
import com.pahimar.ee3.helper.VersionHelper;
import com.pahimar.ee3.lib.Reference;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.client.FMLClientHandler;

View file

@ -1,11 +1,11 @@
package com.pahimar.ee3.core.handler;
package com.pahimar.ee3.handler;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.event.ActionEvent;
import com.pahimar.ee3.event.ActionEvent.ActionResult;
import com.pahimar.ee3.event.ActionRequestEvent;
import com.pahimar.ee3.event.WorldTransmutationEvent;
import com.pahimar.ee3.helper.TransmutationHelper;
import com.pahimar.ee3.lib.ActionTypes;
import com.pahimar.ee3.lib.ItemUpdateTypes;
import com.pahimar.ee3.lib.Particles;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.item.OreStack;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.emc.EmcRegistry;
import com.pahimar.ee3.emc.EmcType;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.lib.Compare;
import net.minecraftforge.fluids.FluidStack;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.item.ModItems;
import com.pahimar.ee3.lib.Colours;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import net.minecraft.client.settings.KeyBinding;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.lib.Reference;
import cpw.mods.fml.common.FMLLog;
@ -21,7 +21,6 @@ public class LogHelper
public static void init()
{
eeLogger.setParent(FMLLog.getLogger());
}
@ -39,8 +38,7 @@ public class LogHelper
public static void severe(Object object)
{
log(Level.SEVERE, object.toString());
log(Level.SEVERE, object);
}
public static void debug(Object object)
@ -57,37 +55,31 @@ public class LogHelper
public static void warning(Object object)
{
log(Level.WARNING, object.toString());
log(Level.WARNING, object);
}
public static void info(Object object)
{
log(Level.INFO, object.toString());
log(Level.INFO, object);
}
public static void config(Object object)
{
log(Level.CONFIG, object.toString());
log(Level.CONFIG, object);
}
public static void fine(Object object)
{
log(Level.FINE, object.toString());
log(Level.FINE, object);
}
public static void finer(Object object)
{
log(Level.FINER, object.toString());
log(Level.FINER, object);
}
public static void finest(Object object)
{
log(Level.FINEST, object.toString());
log(Level.FINEST, object);
}
}

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import net.minecraft.item.ItemStack;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.item.EnergyStack;
import com.pahimar.ee3.item.OreStack;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.lib.Reference;
import net.minecraft.util.ResourceLocation;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.core.handler.EquivalencyHandler;
import com.pahimar.ee3.handler.EquivalencyHandler;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.helper;
package com.pahimar.ee3.helper;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.configuration.GeneralConfiguration;
@ -19,11 +19,12 @@ import java.util.Properties;
* VersionHelper
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*/
public class VersionHelper implements Runnable
{
// TODO Switch how versions are looked up from xml to json (for changelog support)
private static VersionHelper instance = new VersionHelper();
// The (publicly available) remote version number authority file

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.inventory;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.lib.Strings;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.inventory;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.lib.Strings;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.inventory;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.lib.Strings;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

View file

@ -1,8 +1,8 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.ItemHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.lib.Colours;
import com.pahimar.ee3.lib.GuiIds;
import com.pahimar.ee3.lib.Strings;

View file

@ -2,8 +2,8 @@ package com.pahimar.ee3.item;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.TransmutationHelper;
import com.pahimar.ee3.lib.GuiIds;
import com.pahimar.ee3.lib.Strings;
import cpw.mods.fml.relauncher.Side;

View file

@ -2,8 +2,8 @@ package com.pahimar.ee3.item;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.configuration.ConfigurationSettings;
import com.pahimar.ee3.core.helper.ItemStackNBTHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.helper.ItemStackNBTHelper;
import com.pahimar.ee3.helper.TransmutationHelper;
import com.pahimar.ee3.lib.GuiIds;
import com.pahimar.ee3.lib.Sounds;
import com.pahimar.ee3.lib.Strings;

View file

@ -1,9 +1,9 @@
package com.pahimar.ee3.item;
import com.google.gson.*;
import com.pahimar.ee3.core.helper.FluidHelper;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.core.helper.LogHelper;
import com.pahimar.ee3.helper.FluidHelper;
import com.pahimar.ee3.helper.ItemHelper;
import com.pahimar.ee3.helper.LogHelper;
import com.pahimar.ee3.lib.Compare;
import net.minecraft.block.Block;
import net.minecraft.item.Item;

View file

@ -2,7 +2,7 @@ package com.pahimar.ee3.item.crafting;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.core.helper.RecipeHelper;
import com.pahimar.ee3.helper.RecipeHelper;
import com.pahimar.ee3.item.WrappedStack;
import java.util.List;

View file

@ -4,7 +4,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.addon.AddonIndustrialCraft2;
import com.pahimar.ee3.api.RecipeMapping;
import com.pahimar.ee3.core.helper.RecipeHelper;
import com.pahimar.ee3.helper.RecipeHelper;
import com.pahimar.ee3.item.WrappedStack;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;

View file

@ -44,7 +44,7 @@ public class Reference
public static final String FINGERPRINT = "@FINGERPRINT@";
public static final int SECOND_IN_TICKS = 20;
public static final int SHIFTED_ID_RANGE_CORRECTION = 256;
public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy";
public static final String CLIENT_PROXY_CLASS = "com.pahimar.ee3.core.proxy.ClientProxy";
public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.proxy.CommonProxy";
public static final String CLIENT_PROXY_CLASS = "com.pahimar.ee3.proxy.ClientProxy";
public static final int VERSION_CHECK_ATTEMPTS = 3;
}

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.lib;
import com.pahimar.ee3.core.helper.ResourceLocationHelper;
import com.pahimar.ee3.helper.ResourceLocationHelper;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.util.ResourceLocation;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.network.packet;
import com.pahimar.ee3.core.handler.WorldTransmutationHandler;
import com.pahimar.ee3.handler.WorldTransmutationHandler;
import com.pahimar.ee3.network.PacketTypeHandler;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.player.EntityPlayer;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.proxy;
package com.pahimar.ee3.proxy;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.client.audio.SoundHandler;
@ -10,12 +10,12 @@ import com.pahimar.ee3.client.renderer.tileentity.TileEntityAlchemicalChestRende
import com.pahimar.ee3.client.renderer.tileentity.TileEntityAludelRenderer;
import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer;
import com.pahimar.ee3.client.renderer.tileentity.TileEntityGlassBellRenderer;
import com.pahimar.ee3.core.handler.DrawBlockHighlightHandler;
import com.pahimar.ee3.core.handler.KeyBindingHandler;
import com.pahimar.ee3.core.handler.TransmutationTargetOverlayHandler;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.core.helper.KeyBindingHelper;
import com.pahimar.ee3.core.helper.TransmutationHelper;
import com.pahimar.ee3.handler.DrawBlockHighlightHandler;
import com.pahimar.ee3.handler.KeyBindingHandler;
import com.pahimar.ee3.handler.TransmutationTargetOverlayHandler;
import com.pahimar.ee3.helper.ItemHelper;
import com.pahimar.ee3.helper.KeyBindingHelper;
import com.pahimar.ee3.helper.TransmutationHelper;
import com.pahimar.ee3.item.IChargeable;
import com.pahimar.ee3.lib.ActionTypes;
import com.pahimar.ee3.lib.BlockIds;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.core.proxy;
package com.pahimar.ee3.proxy;
import com.pahimar.ee3.client.gui.inventory.*;
import com.pahimar.ee3.inventory.*;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.tileentity;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.helper.ItemHelper;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.network.PacketTypeHandler;
import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.tileentity;
import com.pahimar.ee3.core.helper.ItemHelper;
import com.pahimar.ee3.helper.ItemHelper;
import com.pahimar.ee3.lib.Strings;
import com.pahimar.ee3.network.PacketTypeHandler;
import com.pahimar.ee3.network.packet.PacketTileWithItemUpdate;