Prelim API changes

This commit is contained in:
pahimar 2015-05-07 13:45:06 -04:00
parent 9e82adc423
commit a46b8db610
56 changed files with 90 additions and 60 deletions

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.array;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.array;
import com.pahimar.ee3.EquivalentExchange3;
import cpw.mods.fml.common.Mod;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.array;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

View file

@ -0,0 +1,3 @@
@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|array") package com.pahimar.ee3.api.array;
import cpw.mods.fml.common.API;

View file

@ -0,0 +1,3 @@
@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|event") package com.pahimar.ee3.api.event;
import cpw.mods.fml.common.API;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.exchange;
import com.google.gson.*;
import net.minecraft.nbt.NBTTagCompound;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.exchange;
import com.pahimar.ee3.EquivalentExchange3;
import cpw.mods.fml.common.Mod;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.exchange;
import com.pahimar.ee3.EquivalentExchange3;
import cpw.mods.fml.common.Mod;

View file

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

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.exchange;
import com.pahimar.ee3.EquivalentExchange3;
import cpw.mods.fml.common.Mod;

View file

@ -0,0 +1,3 @@
@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|exchange") package com.pahimar.ee3.api.exchange;
import cpw.mods.fml.common.API;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.knowledge;
import com.pahimar.ee3.EquivalentExchange3;
import cpw.mods.fml.common.Mod;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.knowledge;
import com.pahimar.ee3.EquivalentExchange3;
import cpw.mods.fml.common.Mod;

View file

@ -0,0 +1,3 @@
@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|knowledge") package com.pahimar.ee3.api.knowledge;
import cpw.mods.fml.common.API;

View file

@ -1,3 +1,3 @@
@API(owner = "EE3", apiVersion = "1.1", provides = "EE3|API") package com.pahimar.ee3.api;
@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|core") package com.pahimar.ee3.api;
import cpw.mods.fml.common.API;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.recipe;
import com.pahimar.ee3.EquivalentExchange3;
import cpw.mods.fml.common.Mod;

View file

@ -0,0 +1,3 @@
@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|recipe") package com.pahimar.ee3.api.recipe;
import cpw.mods.fml.common.API;

View file

@ -1,4 +1,4 @@
package com.pahimar.ee3.api;
package com.pahimar.ee3.api.util;
import com.pahimar.ee3.EquivalentExchange3;
import cpw.mods.fml.common.Mod;

View file

@ -0,0 +1,3 @@
@API(owner = "EE3", apiVersion = "1.2", provides = "EE3-API|util") package com.pahimar.ee3.api.util;
import cpw.mods.fml.common.API;

View file

@ -0,0 +1,12 @@
package com.pahimar.ee3.array;
import com.pahimar.ee3.api.array.AlchemyArray;
import net.minecraft.util.ResourceLocation;
public class AlchemyArrayEE extends AlchemyArray
{
public AlchemyArrayEE(ResourceLocation texture, String unlocalizedName)
{
super(texture, unlocalizedName);
}
}

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.array;
import com.google.common.collect.ImmutableSortedSet;
import com.pahimar.ee3.api.AlchemyArray;
import com.pahimar.ee3.api.array.AlchemyArray;
import java.util.SortedSet;
import java.util.TreeSet;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.array;
import com.pahimar.ee3.api.AlchemyArray;
import com.pahimar.ee3.api.array.AlchemyArray;
import com.pahimar.ee3.init.ModBlocks;
import com.pahimar.ee3.reference.Names;
import com.pahimar.ee3.reference.Particles;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.block;
import com.pahimar.ee3.api.AlchemyArray;
import com.pahimar.ee3.api.array.AlchemyArray;
import com.pahimar.ee3.array.AlchemyArrayRegistry;
import com.pahimar.ee3.reference.Names;
import com.pahimar.ee3.reference.RenderIds;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.client.handler;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.api.AlchemyArray;
import com.pahimar.ee3.api.array.AlchemyArray;
import com.pahimar.ee3.array.AlchemyArrayRegistry;
import com.pahimar.ee3.client.util.RenderUtils;
import com.pahimar.ee3.item.*;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.client.handler;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.exchange.WrappedStack;
import com.pahimar.ee3.inventory.ContainerAlchemicalTome;
import com.pahimar.ee3.inventory.ContainerTransmutationTablet;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.client.renderer.tileentity;
import com.pahimar.ee3.api.AlchemyArray;
import com.pahimar.ee3.api.ICustomAlchemyArrayRender;
import com.pahimar.ee3.api.array.AlchemyArray;
import com.pahimar.ee3.api.array.ICustomAlchemyArrayRender;
import com.pahimar.ee3.client.util.RenderUtils;
import com.pahimar.ee3.tileentity.TileEntityAlchemyArray;
import cpw.mods.fml.client.FMLClientHandler;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.exchange.WrappedStack;
import com.pahimar.ee3.network.PacketHandler;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.exchange.WrappedStack;
import com.pahimar.ee3.network.PacketHandler;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.api.knowledge.AbilityRegistryProxy;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Names;
import net.minecraft.command.CommandBase;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.api.knowledge.AbilityRegistryProxy;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Names;
import net.minecraft.command.CommandBase;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.api.knowledge.AbilityRegistryProxy;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Names;
import net.minecraft.command.CommandBase;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.command;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.api.knowledge.AbilityRegistryProxy;
import com.pahimar.ee3.reference.Messages;
import com.pahimar.ee3.reference.Names;
import net.minecraft.command.CommandBase;

View file

@ -2,9 +2,9 @@ package com.pahimar.ee3.exchange;
import com.google.common.collect.ImmutableSortedMap;
import com.google.gson.*;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.IEnergyValueProvider;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.IEnergyValueProvider;
import com.pahimar.ee3.knowledge.AbilityRegistry;
import com.pahimar.ee3.recipe.RecipeRegistry;
import com.pahimar.ee3.reference.Files;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.exchange;
import com.google.gson.*;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValue;
import java.lang.reflect.Type;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.init;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.api.knowledge.AbilityRegistryProxy;
import com.pahimar.ee3.exchange.CachedOreDictionary;
import com.pahimar.ee3.exchange.OreStack;
import net.minecraft.init.Blocks;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.init;
import com.pahimar.ee3.api.AlchemyArray;
import com.pahimar.ee3.api.AlchemyArrayRegistryProxy;
import com.pahimar.ee3.api.array.AlchemyArray;
import com.pahimar.ee3.api.array.AlchemyArrayRegistryProxy;
import com.pahimar.ee3.array.TransmutationAlchemyArray;
public class AlchemyArrays

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.init;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.exchange.OreStack;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.inventory;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.inventory.element.IElementButtonHandler;
import com.pahimar.ee3.inventory.element.IElementSliderHandler;

View file

@ -1,9 +1,9 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.EquivalentExchange3;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.IEnergyValueProvider;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.IEnergyValueProvider;
import com.pahimar.ee3.init.ModItems;
import com.pahimar.ee3.reference.GUIs;
import com.pahimar.ee3.reference.Messages;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.item;
import com.pahimar.ee3.api.AlchemyArray;
import com.pahimar.ee3.api.array.AlchemyArray;
import com.pahimar.ee3.array.AlchemyArrayRegistry;
import com.pahimar.ee3.init.ModBlocks;
import com.pahimar.ee3.network.PacketHandler;

View file

@ -3,7 +3,7 @@ package com.pahimar.ee3.knowledge;
import com.google.gson.*;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import com.pahimar.ee3.api.AbilityRegistryProxy;
import com.pahimar.ee3.api.knowledge.AbilityRegistryProxy;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.exchange.OreStack;
import com.pahimar.ee3.exchange.WrappedStack;

View file

@ -4,8 +4,8 @@ import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.FurnaceRecipeHandler;
import codechicken.nei.recipe.TemplateRecipeHandler;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.client.gui.inventory.GuiCalcinator;
import com.pahimar.ee3.item.ItemAlchemicalDust;
import com.pahimar.ee3.reference.Names;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.network.message;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.exchange.WrappedStack;
import com.pahimar.ee3.util.LogHelper;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.network.message;
import com.google.gson.stream.JsonReader;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.exchange.EnergyValueStackMapping;
import com.pahimar.ee3.exchange.WrappedStack;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.recipe;
import com.google.common.collect.ImmutableList;
import com.pahimar.ee3.api.RecipeRegistryProxy;
import com.pahimar.ee3.api.exchange.RecipeRegistryProxy;
import com.pahimar.ee3.item.crafting.RecipeAludel;
import net.minecraft.item.ItemStack;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.recipe;
import com.pahimar.ee3.api.RecipeRegistryProxy;
import com.pahimar.ee3.api.exchange.RecipeRegistryProxy;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.recipe;
import com.pahimar.ee3.api.RecipeRegistryProxy;
import com.pahimar.ee3.api.exchange.RecipeRegistryProxy;
import com.pahimar.ee3.exchange.WrappedStack;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.recipe;
import com.pahimar.ee3.api.RecipeRegistryProxy;
import com.pahimar.ee3.api.exchange.RecipeRegistryProxy;
import com.pahimar.ee3.exchange.OreStack;
import com.pahimar.ee3.exchange.WrappedStack;
import com.pahimar.ee3.util.RecipeHelper;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.settings;
import com.pahimar.ee3.api.AlchemyArrayRegistryProxy;
import com.pahimar.ee3.api.array.AlchemyArrayRegistryProxy;
import com.pahimar.ee3.util.INBTTaggable;
import net.minecraft.nbt.NBTTagCompound;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.test;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.exchange.WrappedStack;
import com.pahimar.ee3.util.LogHelper;
import com.pahimar.ee3.util.SerializationHelper;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.tileentity;
import com.pahimar.ee3.api.AlchemyArray;
import com.pahimar.ee3.api.array.AlchemyArray;
import com.pahimar.ee3.network.PacketHandler;
import com.pahimar.ee3.network.message.MessageTileEntityAlchemyArray;
import cpw.mods.fml.common.Loader;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.tileentity;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.block.BlockAshInfusedStoneSlab;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.item.ItemAlchemicalTome;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.util;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.init.ModItems;
import com.pahimar.ee3.item.ItemAlchemicalDust;

View file

@ -1,6 +1,6 @@
package com.pahimar.ee3.util;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.exchange.OreStack;
import com.pahimar.ee3.exchange.WrappedStack;

View file

@ -1,7 +1,7 @@
package com.pahimar.ee3.util;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.EnergyValueRegistryProxy;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
import com.pahimar.ee3.reference.Comparators;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;

View file

@ -3,7 +3,7 @@ package com.pahimar.ee3.util;
import com.google.common.io.Files;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import com.pahimar.ee3.api.EnergyValue;
import com.pahimar.ee3.api.exchange.EnergyValue;
import com.pahimar.ee3.exchange.EnergyValueRegistry;
import com.pahimar.ee3.exchange.EnergyValueStackMapping;
import com.pahimar.ee3.exchange.WrappedStack;