Repackaging EE3 packages/classes to better match up with the MC repackaging
This commit is contained in:
parent
7e774b07be
commit
e03797f1ca
88 changed files with 1563 additions and 1500 deletions
|
@ -1,4 +1,26 @@
|
|||
package ee3.common;
|
||||
package com.pahimar.ee3;
|
||||
|
||||
import com.pahimar.ee3.block.ModBlocks;
|
||||
import com.pahimar.ee3.core.handlers.AddonHandler;
|
||||
import com.pahimar.ee3.core.handlers.ConfigurationHandler;
|
||||
import com.pahimar.ee3.core.handlers.EntityLivingHandler;
|
||||
import com.pahimar.ee3.core.handlers.FuelHandler;
|
||||
import com.pahimar.ee3.core.handlers.ItemPickupHandler;
|
||||
import com.pahimar.ee3.core.handlers.LocalizationHandler;
|
||||
import com.pahimar.ee3.core.handlers.ModActionHandler;
|
||||
import com.pahimar.ee3.core.handlers.PacketHandler;
|
||||
import com.pahimar.ee3.core.handlers.PlayerDestroyItemHandler;
|
||||
import com.pahimar.ee3.core.handlers.RenderTickHandler;
|
||||
import com.pahimar.ee3.core.handlers.VersionCheckTickHandler;
|
||||
import com.pahimar.ee3.core.handlers.WorldTransmutationHandler;
|
||||
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.item.ModItems;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.recipe.RecipesTransmutationStone;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
@ -17,27 +39,6 @@ import cpw.mods.fml.common.network.NetworkMod;
|
|||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.TickRegistry;
|
||||
import ee3.client.core.handlers.RenderTickHandler;
|
||||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.core.CommonProxy;
|
||||
import ee3.common.core.CreativeTabEE3;
|
||||
import ee3.common.core.handlers.ModActionHandler;
|
||||
import ee3.common.core.handlers.AddonHandler;
|
||||
import ee3.common.core.handlers.ConfigurationHandler;
|
||||
import ee3.common.core.handlers.EntityLivingHandler;
|
||||
import ee3.common.core.handlers.FuelHandler;
|
||||
import ee3.common.core.handlers.ItemPickupHandler;
|
||||
import ee3.common.core.handlers.LocalizationHandler;
|
||||
import ee3.common.core.handlers.PacketHandler;
|
||||
import ee3.common.core.handlers.PlayerDestroyItemHandler;
|
||||
import ee3.common.core.handlers.VersionCheckTickHandler;
|
||||
import ee3.common.core.handlers.WorldTransmutationHandler;
|
||||
import ee3.common.core.helper.LogHelper;
|
||||
import ee3.common.core.helper.VersionHelper;
|
||||
import ee3.common.item.ModItems;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.recipe.RecipesTransmutationStone;
|
||||
|
||||
/**
|
||||
* EquivalentExchange3
|
|
@ -1,10 +1,11 @@
|
|||
package ee3.common.block;
|
||||
package com.pahimar.ee3.block;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.GuiIds;
|
||||
import com.pahimar.ee3.lib.RenderIds;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.GuiIds;
|
||||
import ee3.common.lib.RenderIds;
|
||||
import ee3.common.lib.Strings;
|
||||
import ee3.common.tile.TileCalcinator;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.block;
|
||||
package com.pahimar.ee3.block;
|
||||
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
|
@ -1,9 +1,10 @@
|
|||
package ee3.common.block;
|
||||
package com.pahimar.ee3.block;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Sprites;
|
||||
import ee3.common.lib.Strings;
|
||||
import net.minecraft.block.BlockFlowing;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
package ee3.common.block;
|
||||
package com.pahimar.ee3.block;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.Sprites;
|
||||
import ee3.common.lib.Strings;
|
||||
import net.minecraft.block.BlockStationary;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
package ee3.common.block;
|
||||
package com.pahimar.ee3.block;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.BlockIds;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.BlockIds;
|
||||
import ee3.common.lib.Strings;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.client.gui;
|
||||
package com.pahimar.ee3.client.gui.inventory;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
@ -6,13 +6,14 @@ import net.minecraft.util.StatCollector;
|
|||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.inventory.ContainerCalcinator;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
|
||||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.container.ContainerCalcinator;
|
||||
import ee3.common.lib.Sprites;
|
||||
import ee3.common.lib.Strings;
|
||||
import ee3.common.tile.TileCalcinator;
|
||||
|
||||
/**
|
||||
* GuiCalcinator
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.client.gui;
|
||||
package com.pahimar.ee3.client.gui.inventory;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -7,9 +7,10 @@ import net.minecraft.world.World;
|
|||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.inventory.ContainerPortableCrafting;
|
||||
|
||||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
import ee3.common.container.ContainerPortableCrafting;
|
||||
|
||||
/**
|
||||
* GuiPortableCrafting
|
|
@ -1,9 +1,10 @@
|
|||
package ee3.client.render;
|
||||
package com.pahimar.ee3.client.model;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import ee3.common.lib.Sprites;
|
||||
import ee3.common.tile.TileCalcinator;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
import net.minecraftforge.client.ForgeHooksClient;
|
|
@ -1,9 +1,11 @@
|
|||
package ee3.client.render;
|
||||
package com.pahimar.ee3.client.renderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Sprites;
|
||||
import com.pahimar.ee3.client.model.ModelCalcinator;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.ForgeHooksClient;
|
||||
|
@ -18,11 +20,11 @@ import net.minecraftforge.client.IItemRenderer;
|
|||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RenderItemCalcinator implements IItemRenderer {
|
||||
public class ItemCalcinatorRenderer implements IItemRenderer {
|
||||
|
||||
private ModelCalcinator calcinatorModel;
|
||||
|
||||
public RenderItemCalcinator() {
|
||||
public ItemCalcinatorRenderer() {
|
||||
calcinatorModel = new ModelCalcinator(1/16F);
|
||||
}
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
package ee3.client.render;
|
||||
package com.pahimar.ee3.client.renderer.texturefx;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.block.ModBlocks;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
|
||||
import net.minecraft.client.renderer.RenderEngine;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import cpw.mods.fml.client.FMLTextureFX;
|
||||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.lib.Sprites;
|
||||
|
||||
/**
|
||||
* TextureRedWaterFX
|
|
@ -1,12 +1,13 @@
|
|||
package ee3.client.render;
|
||||
package com.pahimar.ee3.client.renderer.texturefx;
|
||||
|
||||
import net.minecraft.client.renderer.RenderEngine;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.pahimar.ee3.block.ModBlocks;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
|
||||
import cpw.mods.fml.client.FMLTextureFX;
|
||||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.lib.Sprites;
|
||||
|
||||
/**
|
||||
* TextureRedWaterFlowFX
|
|
@ -1,8 +1,9 @@
|
|||
package ee3.client.render;
|
||||
package com.pahimar.ee3.client.renderer.tileentity;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import ee3.common.tile.TileCalcinator;
|
||||
import com.pahimar.ee3.client.model.ModelCalcinator;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
@ -16,7 +17,7 @@ import net.minecraft.tileentity.TileEntity;
|
|||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RenderCalcinator extends TileEntitySpecialRenderer {
|
||||
public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer {
|
||||
|
||||
static final float scale = (float) (1.0 / 16.0);
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
package ee3.common.core.addons;
|
||||
package com.pahimar.ee3.core.addons;
|
||||
|
||||
import java.util.logging.Level;
|
||||
|
||||
import com.pahimar.ee3.core.helper.LogHelper;
|
||||
import com.pahimar.ee3.core.helper.RecipeHelper;
|
||||
import com.pahimar.ee3.recipe.RecipesTransmutationStone;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
|
||||
import ee3.common.core.helper.LogHelper;
|
||||
import ee3.common.core.helper.RecipeHelper;
|
||||
import ee3.common.recipe.RecipesTransmutationStone;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.src.ModLoader;
|
|
@ -1,6 +1,6 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import ee3.common.core.addons.AddonRedPower2;
|
||||
import com.pahimar.ee3.core.addons.AddonRedPower2;
|
||||
|
||||
/**
|
||||
* AddonHandler
|
|
@ -1,16 +1,18 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.block.ModBlocks;
|
||||
import com.pahimar.ee3.item.ModItems;
|
||||
import com.pahimar.ee3.lib.BlockIds;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.ItemIds;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.item.ModItems;
|
||||
import ee3.common.lib.BlockIds;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.ItemIds;
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Strings;
|
||||
import net.minecraftforge.common.Configuration;
|
||||
import static net.minecraftforge.common.Configuration.*;
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
package ee3.client.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import ee3.common.item.ITransmutationStone;
|
||||
import ee3.common.item.IChargeable;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.Sprites;
|
||||
import com.pahimar.ee3.item.IChargeable;
|
||||
import com.pahimar.ee3.item.ITransmutationStone;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.util.EnumMovingObjectType;
|
||||
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
|
|
@ -1,8 +1,9 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import com.pahimar.ee3.core.helper.ItemDropHelper;
|
||||
import com.pahimar.ee3.core.helper.RedWaterHelper;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
|
||||
import ee3.common.core.helper.ItemDropHelper;
|
||||
import ee3.common.core.helper.RedWaterHelper;
|
||||
import ee3.common.lib.Reference;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
|
@ -1,8 +1,9 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import ee3.common.core.helper.GeneralHelper;
|
||||
import com.pahimar.ee3.core.helper.GeneralHelper;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
/**
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import cpw.mods.fml.common.IFuelHandler;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
|
|
@ -1,8 +1,21 @@
|
|||
package ee3.client.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.core.helper.KeyBindingHelper;
|
||||
import com.pahimar.ee3.core.helper.LogHelper;
|
||||
import com.pahimar.ee3.item.IKeyBound;
|
||||
import com.pahimar.ee3.item.ITransmutationStone;
|
||||
import com.pahimar.ee3.item.ModItems;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.GuiIds;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
import com.pahimar.ee3.network.packet.PacketEE;
|
||||
import com.pahimar.ee3.network.packet.PacketKeyPressed;
|
||||
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
|
@ -12,18 +25,6 @@ import cpw.mods.fml.client.registry.KeyBindingRegistry;
|
|||
import cpw.mods.fml.common.TickType;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.client.core.helper.KeyBindingHelper;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.core.helper.LogHelper;
|
||||
import ee3.common.item.IKeyBound;
|
||||
import ee3.common.item.ITransmutationStone;
|
||||
import ee3.common.item.ModItems;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.GuiIds;
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.network.PacketEE;
|
||||
import ee3.common.network.PacketKeyPressed;
|
||||
import ee3.common.network.PacketTypeHandler;
|
||||
|
||||
/**
|
||||
* KeyBindingHandler
|
|
@ -1,8 +1,9 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import com.pahimar.ee3.core.helper.LocalizationHelper;
|
||||
import com.pahimar.ee3.lib.Localizations;
|
||||
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.core.helper.LocalizationHelper;
|
||||
import ee3.common.lib.Localizations;
|
||||
|
||||
/**
|
||||
* LocalizationHandler
|
|
@ -1,6 +1,7 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import com.pahimar.ee3.event.ModActionEvent;
|
||||
|
||||
import ee3.common.event.ModActionEvent;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
|
||||
public class ModActionHandler {
|
|
@ -1,15 +1,16 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.DataInputStream;
|
||||
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
import com.pahimar.ee3.network.packet.PacketEE;
|
||||
|
||||
import net.minecraft.network.INetworkManager;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
import cpw.mods.fml.common.network.IPacketHandler;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import ee3.common.network.PacketEE;
|
||||
import ee3.common.network.PacketTypeHandler;
|
||||
|
||||
/**
|
||||
* PacketHandler
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
|
|
@ -1,10 +1,17 @@
|
|||
package ee3.client.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import com.pahimar.ee3.core.helper.RenderUtils;
|
||||
import com.pahimar.ee3.core.helper.TransmutationHelper;
|
||||
import com.pahimar.ee3.core.helper.VersionHelper;
|
||||
import com.pahimar.ee3.item.ITransmutationStone;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
|
@ -17,12 +24,6 @@ import net.minecraft.util.MovingObjectPosition;
|
|||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.common.ITickHandler;
|
||||
import cpw.mods.fml.common.TickType;
|
||||
import ee3.client.core.helper.RenderUtils;
|
||||
import ee3.common.core.helper.TransmutationHelper;
|
||||
import ee3.common.core.helper.VersionHelper;
|
||||
import ee3.common.item.ITransmutationStone;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
public class RenderTickHandler implements ITickHandler {
|
||||
|
|
@ -1,11 +1,13 @@
|
|||
package ee3.client.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import com.pahimar.ee3.core.helper.LogHelper;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Sounds;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import ee3.common.core.helper.LogHelper;
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Sounds;
|
||||
import net.minecraftforge.client.event.sound.SoundLoadEvent;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
import com.pahimar.ee3.core.helper.VersionHelper;
|
||||
import com.pahimar.ee3.lib.Colours;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.common.ITickHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.TickType;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.core.helper.VersionHelper;
|
||||
import ee3.common.lib.Colours;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* VersionCheckTickHandler
|
|
@ -1,6 +1,7 @@
|
|||
package ee3.common.core.handlers;
|
||||
package com.pahimar.ee3.core.handlers;
|
||||
|
||||
import com.pahimar.ee3.event.WorldTransmutationEvent;
|
||||
|
||||
import ee3.common.event.WorldTransmutationEvent;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import com.pahimar.ee3.item.ModItems;
|
||||
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import ee3.common.item.ModItems;
|
||||
|
||||
/**
|
||||
* ItemDropHelper
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.client.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
/**
|
||||
* LocalizationHelper
|
|
@ -1,12 +1,13 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* LogHelper
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import com.pahimar.ee3.block.ModBlocks;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
|
||||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.client.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
|
@ -1,9 +1,10 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import ee3.common.core.handlers.EquivalencyHandler;
|
||||
import ee3.common.lib.Sounds;
|
||||
import com.pahimar.ee3.core.handlers.EquivalencyHandler;
|
||||
import com.pahimar.ee3.lib.Sounds;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockSand;
|
||||
import net.minecraft.block.BlockLeaves;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.core.helper;
|
||||
package com.pahimar.ee3.core.helper;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
@ -6,13 +6,14 @@ import java.net.URL;
|
|||
import java.util.Properties;
|
||||
import java.util.logging.Level;
|
||||
|
||||
import com.pahimar.ee3.lib.Colours;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.lib.Colours;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Strings;
|
||||
|
||||
/**
|
||||
* VersionHelper
|
|
@ -1,4 +1,20 @@
|
|||
package ee3.client.core;
|
||||
package com.pahimar.ee3.core.proxy;
|
||||
|
||||
import com.pahimar.ee3.client.renderer.ItemCalcinatorRenderer;
|
||||
import com.pahimar.ee3.client.renderer.texturefx.TextureRedWaterFX;
|
||||
import com.pahimar.ee3.client.renderer.texturefx.TextureRedWaterFlowFX;
|
||||
import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer;
|
||||
import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler;
|
||||
import com.pahimar.ee3.core.handlers.KeyBindingHandler;
|
||||
import com.pahimar.ee3.core.handlers.RenderTickHandler;
|
||||
import com.pahimar.ee3.core.handlers.SoundHandler;
|
||||
import com.pahimar.ee3.core.helper.KeyBindingHelper;
|
||||
import com.pahimar.ee3.lib.BlockIds;
|
||||
import com.pahimar.ee3.lib.RenderIds;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
import com.pahimar.ee3.network.packet.PacketWorldEvent;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraftforge.client.EnumHelperClient;
|
||||
|
@ -12,23 +28,7 @@ import cpw.mods.fml.common.Side;
|
|||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import cpw.mods.fml.common.registry.TickRegistry;
|
||||
import ee3.client.core.handlers.DrawBlockHighlightHandler;
|
||||
import ee3.client.core.handlers.KeyBindingHandler;
|
||||
import ee3.client.core.handlers.RenderTickHandler;
|
||||
import ee3.client.core.handlers.SoundHandler;
|
||||
import ee3.client.core.helper.KeyBindingHelper;
|
||||
import ee3.client.render.RenderCalcinator;
|
||||
import ee3.client.render.RenderItemCalcinator;
|
||||
import ee3.client.render.TextureRedWaterFX;
|
||||
import ee3.client.render.TextureRedWaterFlowFX;
|
||||
import ee3.common.core.CommonProxy;
|
||||
import ee3.common.lib.BlockIds;
|
||||
import ee3.common.lib.RenderIds;
|
||||
import ee3.common.lib.Sprites;
|
||||
import ee3.common.network.PacketTypeHandler;
|
||||
import ee3.common.network.PacketWorldEvent;
|
||||
import ee3.common.tile.TileCalcinator;
|
||||
import static ee3.common.lib.CustomItemRarity.*;
|
||||
import static com.pahimar.ee3.lib.CustomItemRarity.*;
|
||||
|
||||
/**
|
||||
* ClientProxy
|
||||
|
@ -105,7 +105,7 @@ public class ClientProxy extends CommonProxy {
|
|||
FMLClientHandler.instance().getClient().renderEngine.registerTextureFX(new TextureRedWaterFX());
|
||||
FMLClientHandler.instance().getClient().renderEngine.registerTextureFX(new TextureRedWaterFlowFX());
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new RenderItemCalcinator());
|
||||
MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -113,7 +113,7 @@ public class ClientProxy extends CommonProxy {
|
|||
|
||||
super.initTileEntities();
|
||||
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new RenderCalcinator());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new TileEntityCalcinatorRenderer());
|
||||
}
|
||||
|
||||
@Override
|
|
@ -1,17 +1,18 @@
|
|||
package ee3.common.core;
|
||||
package com.pahimar.ee3.core.proxy;
|
||||
|
||||
import com.pahimar.ee3.client.gui.inventory.GuiCalcinator;
|
||||
import com.pahimar.ee3.client.gui.inventory.GuiPortableCrafting;
|
||||
import com.pahimar.ee3.inventory.ContainerCalcinator;
|
||||
import com.pahimar.ee3.inventory.ContainerPortableCrafting;
|
||||
import com.pahimar.ee3.lib.GuiIds;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.network.IGuiHandler;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import ee3.client.gui.GuiCalcinator;
|
||||
import ee3.client.gui.GuiPortableCrafting;
|
||||
import ee3.common.container.ContainerCalcinator;
|
||||
import ee3.common.container.ContainerPortableCrafting;
|
||||
import ee3.common.lib.GuiIds;
|
||||
import ee3.common.lib.Strings;
|
||||
import ee3.common.tile.TileCalcinator;
|
||||
|
||||
/**
|
||||
* CommonProxy
|
|
@ -1,9 +1,10 @@
|
|||
package ee3.common.core;
|
||||
package com.pahimar.ee3.creativetab;
|
||||
|
||||
import com.pahimar.ee3.item.ModItems;
|
||||
import com.pahimar.ee3.lib.ItemIds;
|
||||
|
||||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
import ee3.common.item.ModItems;
|
||||
import ee3.common.lib.ItemIds;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.emc;
|
||||
package com.pahimar.ee3.emc;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.emc;
|
||||
package com.pahimar.ee3.emc;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.emc;
|
||||
package com.pahimar.ee3.emc;
|
||||
|
||||
/**
|
||||
* EMCType
|
|
@ -1,7 +1,9 @@
|
|||
package ee3.common.event;
|
||||
package com.pahimar.ee3.event;
|
||||
|
||||
import static net.minecraftforge.event.Event.Result.*;
|
||||
import ee3.common.lib.ModAction;
|
||||
|
||||
import com.pahimar.ee3.lib.ModAction;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraftforge.event.Cancelable;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.event;
|
||||
package com.pahimar.ee3.event;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
|
@ -1,6 +1,7 @@
|
|||
package ee3.common.container;
|
||||
package com.pahimar.ee3.inventory;
|
||||
|
||||
import com.pahimar.ee3.tileentity.TileCalcinator;
|
||||
|
||||
import ee3.common.tile.TileCalcinator;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Container;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.container;
|
||||
package com.pahimar.ee3.inventory;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
|
@ -1,16 +1,17 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Colours;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.Colours;
|
||||
import ee3.common.lib.Strings;
|
||||
|
||||
public class ItemAlchemyBag extends ItemEE {
|
||||
|
|
@ -1,7 +1,11 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.CustomItemRarity;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
@ -9,9 +13,6 @@ import net.minecraft.util.MathHelper;
|
|||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.CustomItemRarity;
|
||||
import ee3.common.lib.Strings;
|
||||
|
||||
/**
|
||||
* ItemAlchemyDust
|
|
@ -1,7 +1,8 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Sprites;
|
||||
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Sprites;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
/**
|
|
@ -1,7 +1,8 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.Strings;
|
||||
|
||||
/**
|
||||
* ItemInertStone
|
|
@ -1,7 +1,8 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.Strings;
|
||||
|
||||
/**
|
||||
* ItemMiniumShard
|
|
@ -1,4 +1,15 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.core.helper.TransmutationHelper;
|
||||
import com.pahimar.ee3.lib.Colours;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.CustomItemRarity;
|
||||
import com.pahimar.ee3.lib.GuiIds;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
import com.pahimar.ee3.network.packet.PacketKeyPressed;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
|
@ -8,16 +19,6 @@ import cpw.mods.fml.client.FMLClientHandler;
|
|||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.core.helper.TransmutationHelper;
|
||||
import ee3.common.lib.Colours;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.CustomItemRarity;
|
||||
import ee3.common.lib.GuiIds;
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Strings;
|
||||
import ee3.common.network.PacketKeyPressed;
|
||||
import ee3.common.network.PacketTypeHandler;
|
||||
|
||||
/**
|
||||
* ItemMiniumStone
|
|
@ -1,21 +1,22 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.core.helper.NBTHelper;
|
||||
import com.pahimar.ee3.core.helper.TransmutationHelper;
|
||||
import com.pahimar.ee3.lib.ConfigurationSettings;
|
||||
import com.pahimar.ee3.lib.CustomItemRarity;
|
||||
import com.pahimar.ee3.lib.GuiIds;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Sounds;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
import com.pahimar.ee3.lib.WorldEvents;
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
import com.pahimar.ee3.network.packet.PacketKeyPressed;
|
||||
import com.pahimar.ee3.network.packet.PacketWorldEvent;
|
||||
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
import cpw.mods.fml.common.Side;
|
||||
import cpw.mods.fml.common.asm.SideOnly;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.core.helper.NBTHelper;
|
||||
import ee3.common.core.helper.TransmutationHelper;
|
||||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.CustomItemRarity;
|
||||
import ee3.common.lib.GuiIds;
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Sounds;
|
||||
import ee3.common.lib.Strings;
|
||||
import ee3.common.lib.WorldEvents;
|
||||
import ee3.common.network.PacketKeyPressed;
|
||||
import ee3.common.network.PacketTypeHandler;
|
||||
import ee3.common.network.PacketWorldEvent;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,10 +1,11 @@
|
|||
package ee3.common.item;
|
||||
package com.pahimar.ee3.item;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.lib.ItemIds;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.ItemIds;
|
||||
import ee3.common.lib.Strings;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* BlockIds
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* Colours
|
|
@ -1,7 +1,8 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
import com.pahimar.ee3.item.ModItems;
|
||||
|
||||
import net.minecraftforge.common.Configuration;
|
||||
import ee3.common.item.ModItems;
|
||||
|
||||
/**
|
||||
* ConfigurationSettings
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* CustomItemRarity
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* GuiIds
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* ItemIds
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* Localizations
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
|
||||
public enum ModAction {
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* PacketIds
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* Reference
|
||||
|
@ -21,7 +21,7 @@ public class Reference {
|
|||
public static final String CHANNEL_NAME = MOD_ID;
|
||||
public static final int SECOND_IN_TICKS = 20;
|
||||
public static final int SHIFTED_ID_RANGE_CORRECTION = 256;
|
||||
public static final String SERVER_PROXY_CLASS = "ee3.common.core.CommonProxy";
|
||||
public static final String CLIENT_PROXY_CLASS = "ee3.client.core.ClientProxy";
|
||||
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";
|
||||
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* RenderIds
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
/**
|
||||
* Sounds
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
|
||||
public class Sprites {
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
public class Strings {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.lib;
|
||||
package com.pahimar.ee3.lib;
|
||||
|
||||
|
||||
public class WorldEvents {
|
|
@ -1,12 +1,17 @@
|
|||
package ee3.common.network;
|
||||
package com.pahimar.ee3.network;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.DataInputStream;
|
||||
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.network.packet.PacketEE;
|
||||
import com.pahimar.ee3.network.packet.PacketKeyPressed;
|
||||
import com.pahimar.ee3.network.packet.PacketTileUpdate;
|
||||
import com.pahimar.ee3.network.packet.PacketWorldEvent;
|
||||
|
||||
import net.minecraft.network.packet.Packet;
|
||||
import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
|
||||
/**
|
|
@ -1,10 +1,12 @@
|
|||
package ee3.common.network;
|
||||
package com.pahimar.ee3.network.packet;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
|
||||
import net.minecraft.network.INetworkManager;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
|
||||
|
@ -19,8 +21,8 @@ import cpw.mods.fml.common.network.Player;
|
|||
*/
|
||||
public class PacketEE {
|
||||
|
||||
protected PacketTypeHandler packetType;
|
||||
protected boolean isChunkDataPacket;
|
||||
public PacketTypeHandler packetType;
|
||||
public boolean isChunkDataPacket;
|
||||
|
||||
public PacketEE(PacketTypeHandler packetType, boolean isChunkDataPacket) {
|
||||
this.packetType = packetType;
|
|
@ -1,20 +1,22 @@
|
|||
package ee3.common.network;
|
||||
package com.pahimar.ee3.network.packet;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.pahimar.ee3.EquivalentExchange3;
|
||||
import com.pahimar.ee3.item.IKeyBound;
|
||||
import com.pahimar.ee3.item.ITransmutationStone;
|
||||
import com.pahimar.ee3.lib.GuiIds;
|
||||
import com.pahimar.ee3.lib.ItemIds;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.network.INetworkManager;
|
||||
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.item.IKeyBound;
|
||||
import ee3.common.item.ITransmutationStone;
|
||||
import ee3.common.lib.GuiIds;
|
||||
import ee3.common.lib.ItemIds;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* PacketKeyPressed
|
|
@ -1,9 +1,11 @@
|
|||
package ee3.common.network;
|
||||
package com.pahimar.ee3.network.packet;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
|
||||
import net.minecraft.network.INetworkManager;
|
|
@ -1,9 +1,15 @@
|
|||
package ee3.common.network;
|
||||
package com.pahimar.ee3.network.packet;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.pahimar.ee3.event.ModActionEvent;
|
||||
import com.pahimar.ee3.event.WorldTransmutationEvent;
|
||||
import com.pahimar.ee3.lib.ModAction;
|
||||
import com.pahimar.ee3.lib.WorldEvents;
|
||||
import com.pahimar.ee3.network.PacketTypeHandler;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.network.INetworkManager;
|
||||
import net.minecraft.world.World;
|
||||
|
@ -12,10 +18,6 @@ import net.minecraftforge.event.Event;
|
|||
import net.minecraftforge.event.Event.Result;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
|
||||
import cpw.mods.fml.common.network.Player;
|
||||
import ee3.common.event.ModActionEvent;
|
||||
import ee3.common.event.WorldTransmutationEvent;
|
||||
import ee3.common.lib.ModAction;
|
||||
import ee3.common.lib.WorldEvents;
|
||||
|
||||
public class PacketWorldEvent extends PacketEE {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.recipe;
|
||||
package com.pahimar.ee3.recipe;
|
||||
|
||||
/**
|
||||
* RecipesCalcinator
|
|
@ -1,4 +1,4 @@
|
|||
package ee3.common.recipe;
|
||||
package com.pahimar.ee3.recipe;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
@ -6,17 +6,18 @@ import java.util.Iterator;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.pahimar.ee3.core.handlers.EquivalencyHandler;
|
||||
import com.pahimar.ee3.core.helper.GeneralHelper;
|
||||
import com.pahimar.ee3.core.helper.RecipeHelper;
|
||||
import com.pahimar.ee3.item.ModItems;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
|
||||
import cpw.mods.fml.common.ObfuscationReflectionHelper;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import ee3.common.core.handlers.EquivalencyHandler;
|
||||
import ee3.common.core.helper.GeneralHelper;
|
||||
import ee3.common.core.helper.RecipeHelper;
|
||||
import ee3.common.item.ModItems;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* RecipesTransmutationStone
|
|
@ -1,7 +1,8 @@
|
|||
package ee3.common.tile;
|
||||
package com.pahimar.ee3.tileentity;
|
||||
|
||||
import com.pahimar.ee3.block.ModBlocks;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.lib.Strings;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
|
@ -1,7 +1,8 @@
|
|||
package ee3.common.tile;
|
||||
package com.pahimar.ee3.tileentity;
|
||||
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
import com.pahimar.ee3.lib.Strings;
|
||||
|
||||
import ee3.common.lib.Reference;
|
||||
import ee3.common.lib.Strings;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties version="1.0">
|
||||
<comment>German (DE) Localization File</comment>
|
||||
|
@ -31,7 +31,7 @@
|
|||
<entry key="item.alchemyBag.brown.name">Brauner Alchemiebeutel</entry>
|
||||
<entry key="item.alchemyBag.green.name">Grüner Alchemiebeutel</entry>
|
||||
<entry key="item.alchemyBag.red.name">Roter Alchemiebeutel</entry>
|
||||
<entry key="item.alchemyBag.black.name">Schwarzer Alchemiebeutel</entry></entry>
|
||||
<entry key="item.alchemyBag.black.name">Schwarzer Alchemiebeutel</entry>
|
||||
<entry key="tile.redWaterStill.name">Rotes Wasser (Still)</entry>
|
||||
<entry key="tile.redWaterFlowing.name">Rotes Wasser (Fließend)</entry>
|
||||
<entry key="tile.calcinator.name">Kalzinierer</entry>
|
||||
|
|
Loading…
Reference in a new issue