From a46b8db6107afb0949296c96178742193b793e0a Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 7 May 2015 13:45:06 -0400 Subject: [PATCH] Prelim API changes --- .../pahimar/ee3/api/{ => array}/AlchemyArray.java | 2 +- .../api/{ => array}/AlchemyArrayRegistryProxy.java | 2 +- .../api/{ => array}/ICustomAlchemyArrayRender.java | 2 +- .../java/com/pahimar/ee3/api/array/package-info.java | 3 +++ .../java/com/pahimar/ee3/api/event/package-info.java | 3 +++ .../pahimar/ee3/api/{ => exchange}/EnergyValue.java | 2 +- .../{ => exchange}/EnergyValueMappingsTester.java | 2 +- .../api/{ => exchange}/EnergyValueRegistryProxy.java | 2 +- .../ee3/api/{ => exchange}/IEnergyValueProvider.java | 2 +- .../ee3/api/{ => exchange}/RecipeRegistryProxy.java | 2 +- .../com/pahimar/ee3/api/exchange/package-info.java | 3 +++ .../api/{ => knowledge}/AbilityRegistryProxy.java | 2 +- .../TransmutationKnowledgeRegistryProxy.java | 2 +- .../com/pahimar/ee3/api/knowledge/package-info.java | 3 +++ src/main/java/com/pahimar/ee3/api/package-info.java | 2 +- .../ee3/api/{ => recipe}/AludelRecipeProxy.java | 2 +- .../com/pahimar/ee3/api/recipe/package-info.java | 3 +++ .../ee3/api/{ => util}/TileEntityDataProxy.java | 2 +- .../java/com/pahimar/ee3/api/util/package-info.java | 3 +++ .../java/com/pahimar/ee3/array/AlchemyArrayEE.java | 12 ++++++++++++ .../com/pahimar/ee3/array/AlchemyArrayRegistry.java | 2 +- .../pahimar/ee3/array/TransmutationAlchemyArray.java | 2 +- .../com/pahimar/ee3/block/BlockAlchemyArray.java | 2 +- .../handler/DrawBlockHighlightEventHandler.java | 2 +- .../ee3/client/handler/ItemTooltipEventHandler.java | 4 ++-- .../tileentity/TileEntityRendererAlchemyArray.java | 4 ++-- .../pahimar/ee3/command/CommandSetEnergyValue.java | 2 +- .../command/CommandSetEnergyValueCurrentItem.java | 2 +- .../pahimar/ee3/command/CommandSetItemLearnable.java | 2 +- .../ee3/command/CommandSetItemNotLearnable.java | 2 +- .../ee3/command/CommandSetItemNotRecoverable.java | 2 +- .../ee3/command/CommandSetItemRecoverable.java | 2 +- .../pahimar/ee3/exchange/EnergyValueRegistry.java | 6 +++--- .../ee3/exchange/EnergyValueStackMapping.java | 2 +- src/main/java/com/pahimar/ee3/init/Abilities.java | 2 +- .../java/com/pahimar/ee3/init/AlchemyArrays.java | 4 ++-- src/main/java/com/pahimar/ee3/init/EnergyValues.java | 2 +- .../ee3/inventory/ContainerTransmutationTablet.java | 2 +- .../com/pahimar/ee3/item/ItemAlchemicalTome.java | 6 +++--- src/main/java/com/pahimar/ee3/item/ItemChalk.java | 2 +- .../com/pahimar/ee3/knowledge/AbilityRegistry.java | 2 +- .../java/com/pahimar/ee3/nei/CalcinationHandler.java | 4 ++-- .../ee3/network/message/MessageSetEnergyValue.java | 2 +- .../ee3/network/message/MessageSyncEnergyValues.java | 2 +- .../com/pahimar/ee3/recipe/AludelRecipeManager.java | 2 +- .../pahimar/ee3/recipe/RecipesFluidContainers.java | 2 +- .../java/com/pahimar/ee3/recipe/RecipesPotions.java | 2 +- .../java/com/pahimar/ee3/recipe/RecipesVanilla.java | 2 +- .../java/com/pahimar/ee3/settings/ChalkSettings.java | 2 +- .../ee3/test/EnergyValueMappingsTestSuite.java | 4 ++-- .../ee3/tileentity/TileEntityAlchemyArray.java | 2 +- .../tileentity/TileEntityTransmutationTablet.java | 4 ++-- .../java/com/pahimar/ee3/util/CalcinationHelper.java | 2 +- .../java/com/pahimar/ee3/util/EnergyValueHelper.java | 2 +- src/main/java/com/pahimar/ee3/util/FilterUtils.java | 4 ++-- .../com/pahimar/ee3/util/SerializationHelper.java | 2 +- 56 files changed, 90 insertions(+), 60 deletions(-) rename src/main/java/com/pahimar/ee3/api/{ => array}/AlchemyArray.java (99%) rename src/main/java/com/pahimar/ee3/api/{ => array}/AlchemyArrayRegistryProxy.java (96%) rename src/main/java/com/pahimar/ee3/api/{ => array}/ICustomAlchemyArrayRender.java (92%) create mode 100644 src/main/java/com/pahimar/ee3/api/array/package-info.java create mode 100644 src/main/java/com/pahimar/ee3/api/event/package-info.java rename src/main/java/com/pahimar/ee3/api/{ => exchange}/EnergyValue.java (99%) rename src/main/java/com/pahimar/ee3/api/{ => exchange}/EnergyValueMappingsTester.java (95%) rename src/main/java/com/pahimar/ee3/api/{ => exchange}/EnergyValueRegistryProxy.java (98%) rename src/main/java/com/pahimar/ee3/api/{ => exchange}/IEnergyValueProvider.java (79%) rename src/main/java/com/pahimar/ee3/api/{ => exchange}/RecipeRegistryProxy.java (96%) create mode 100644 src/main/java/com/pahimar/ee3/api/exchange/package-info.java rename src/main/java/com/pahimar/ee3/api/{ => knowledge}/AbilityRegistryProxy.java (98%) rename src/main/java/com/pahimar/ee3/api/{ => knowledge}/TransmutationKnowledgeRegistryProxy.java (99%) create mode 100644 src/main/java/com/pahimar/ee3/api/knowledge/package-info.java rename src/main/java/com/pahimar/ee3/api/{ => recipe}/AludelRecipeProxy.java (96%) create mode 100644 src/main/java/com/pahimar/ee3/api/recipe/package-info.java rename src/main/java/com/pahimar/ee3/api/{ => util}/TileEntityDataProxy.java (98%) create mode 100644 src/main/java/com/pahimar/ee3/api/util/package-info.java create mode 100644 src/main/java/com/pahimar/ee3/array/AlchemyArrayEE.java diff --git a/src/main/java/com/pahimar/ee3/api/AlchemyArray.java b/src/main/java/com/pahimar/ee3/api/array/AlchemyArray.java similarity index 99% rename from src/main/java/com/pahimar/ee3/api/AlchemyArray.java rename to src/main/java/com/pahimar/ee3/api/array/AlchemyArray.java index 5a6c6d65..e6e711bd 100644 --- a/src/main/java/com/pahimar/ee3/api/AlchemyArray.java +++ b/src/main/java/com/pahimar/ee3/api/array/AlchemyArray.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/AlchemyArrayRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/array/AlchemyArrayRegistryProxy.java similarity index 96% rename from src/main/java/com/pahimar/ee3/api/AlchemyArrayRegistryProxy.java rename to src/main/java/com/pahimar/ee3/api/array/AlchemyArrayRegistryProxy.java index f944e93d..adab61a2 100644 --- a/src/main/java/com/pahimar/ee3/api/AlchemyArrayRegistryProxy.java +++ b/src/main/java/com/pahimar/ee3/api/array/AlchemyArrayRegistryProxy.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/ICustomAlchemyArrayRender.java b/src/main/java/com/pahimar/ee3/api/array/ICustomAlchemyArrayRender.java similarity index 92% rename from src/main/java/com/pahimar/ee3/api/ICustomAlchemyArrayRender.java rename to src/main/java/com/pahimar/ee3/api/array/ICustomAlchemyArrayRender.java index cfee9cd8..e5586ed9 100644 --- a/src/main/java/com/pahimar/ee3/api/ICustomAlchemyArrayRender.java +++ b/src/main/java/com/pahimar/ee3/api/array/ICustomAlchemyArrayRender.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/array/package-info.java b/src/main/java/com/pahimar/ee3/api/array/package-info.java new file mode 100644 index 00000000..601c8009 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/api/array/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/event/package-info.java b/src/main/java/com/pahimar/ee3/api/event/package-info.java new file mode 100644 index 00000000..0c36df44 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/api/event/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/EnergyValue.java b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValue.java similarity index 99% rename from src/main/java/com/pahimar/ee3/api/EnergyValue.java rename to src/main/java/com/pahimar/ee3/api/exchange/EnergyValue.java index 34fae1d1..cc9d0fca 100644 --- a/src/main/java/com/pahimar/ee3/api/EnergyValue.java +++ b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValue.java @@ -1,4 +1,4 @@ -package com.pahimar.ee3.api; +package com.pahimar.ee3.api.exchange; import com.google.gson.*; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/pahimar/ee3/api/EnergyValueMappingsTester.java b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueMappingsTester.java similarity index 95% rename from src/main/java/com/pahimar/ee3/api/EnergyValueMappingsTester.java rename to src/main/java/com/pahimar/ee3/api/exchange/EnergyValueMappingsTester.java index fd94178b..cc22a041 100644 --- a/src/main/java/com/pahimar/ee3/api/EnergyValueMappingsTester.java +++ b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueMappingsTester.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/EnergyValueRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java similarity index 98% rename from src/main/java/com/pahimar/ee3/api/EnergyValueRegistryProxy.java rename to src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java index 52866846..a44d3c55 100644 --- a/src/main/java/com/pahimar/ee3/api/EnergyValueRegistryProxy.java +++ b/src/main/java/com/pahimar/ee3/api/exchange/EnergyValueRegistryProxy.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/IEnergyValueProvider.java b/src/main/java/com/pahimar/ee3/api/exchange/IEnergyValueProvider.java similarity index 79% rename from src/main/java/com/pahimar/ee3/api/IEnergyValueProvider.java rename to src/main/java/com/pahimar/ee3/api/exchange/IEnergyValueProvider.java index 06c2fd36..f3baeecf 100644 --- a/src/main/java/com/pahimar/ee3/api/IEnergyValueProvider.java +++ b/src/main/java/com/pahimar/ee3/api/exchange/IEnergyValueProvider.java @@ -1,4 +1,4 @@ -package com.pahimar.ee3.api; +package com.pahimar.ee3.api.exchange; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/pahimar/ee3/api/RecipeRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/exchange/RecipeRegistryProxy.java similarity index 96% rename from src/main/java/com/pahimar/ee3/api/RecipeRegistryProxy.java rename to src/main/java/com/pahimar/ee3/api/exchange/RecipeRegistryProxy.java index ae2e1fc3..a075c490 100644 --- a/src/main/java/com/pahimar/ee3/api/RecipeRegistryProxy.java +++ b/src/main/java/com/pahimar/ee3/api/exchange/RecipeRegistryProxy.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/exchange/package-info.java b/src/main/java/com/pahimar/ee3/api/exchange/package-info.java new file mode 100644 index 00000000..990fd3ed --- /dev/null +++ b/src/main/java/com/pahimar/ee3/api/exchange/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/AbilityRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/knowledge/AbilityRegistryProxy.java similarity index 98% rename from src/main/java/com/pahimar/ee3/api/AbilityRegistryProxy.java rename to src/main/java/com/pahimar/ee3/api/knowledge/AbilityRegistryProxy.java index 8cd76166..8cb6a54e 100644 --- a/src/main/java/com/pahimar/ee3/api/AbilityRegistryProxy.java +++ b/src/main/java/com/pahimar/ee3/api/knowledge/AbilityRegistryProxy.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/TransmutationKnowledgeRegistryProxy.java b/src/main/java/com/pahimar/ee3/api/knowledge/TransmutationKnowledgeRegistryProxy.java similarity index 99% rename from src/main/java/com/pahimar/ee3/api/TransmutationKnowledgeRegistryProxy.java rename to src/main/java/com/pahimar/ee3/api/knowledge/TransmutationKnowledgeRegistryProxy.java index f70550ae..6ef61001 100644 --- a/src/main/java/com/pahimar/ee3/api/TransmutationKnowledgeRegistryProxy.java +++ b/src/main/java/com/pahimar/ee3/api/knowledge/TransmutationKnowledgeRegistryProxy.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/knowledge/package-info.java b/src/main/java/com/pahimar/ee3/api/knowledge/package-info.java new file mode 100644 index 00000000..cabae84f --- /dev/null +++ b/src/main/java/com/pahimar/ee3/api/knowledge/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/package-info.java b/src/main/java/com/pahimar/ee3/api/package-info.java index 79244385..5233b6ab 100644 --- a/src/main/java/com/pahimar/ee3/api/package-info.java +++ b/src/main/java/com/pahimar/ee3/api/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/AludelRecipeProxy.java b/src/main/java/com/pahimar/ee3/api/recipe/AludelRecipeProxy.java similarity index 96% rename from src/main/java/com/pahimar/ee3/api/AludelRecipeProxy.java rename to src/main/java/com/pahimar/ee3/api/recipe/AludelRecipeProxy.java index e828a9fc..3349b4ca 100644 --- a/src/main/java/com/pahimar/ee3/api/AludelRecipeProxy.java +++ b/src/main/java/com/pahimar/ee3/api/recipe/AludelRecipeProxy.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/recipe/package-info.java b/src/main/java/com/pahimar/ee3/api/recipe/package-info.java new file mode 100644 index 00000000..1af79aae --- /dev/null +++ b/src/main/java/com/pahimar/ee3/api/recipe/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/api/TileEntityDataProxy.java b/src/main/java/com/pahimar/ee3/api/util/TileEntityDataProxy.java similarity index 98% rename from src/main/java/com/pahimar/ee3/api/TileEntityDataProxy.java rename to src/main/java/com/pahimar/ee3/api/util/TileEntityDataProxy.java index c690096a..1b94cf40 100644 --- a/src/main/java/com/pahimar/ee3/api/TileEntityDataProxy.java +++ b/src/main/java/com/pahimar/ee3/api/util/TileEntityDataProxy.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/api/util/package-info.java b/src/main/java/com/pahimar/ee3/api/util/package-info.java new file mode 100644 index 00000000..4fb372d0 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/api/util/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayEE.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayEE.java new file mode 100644 index 00000000..cd55efd1 --- /dev/null +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayEE.java @@ -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); + } +} diff --git a/src/main/java/com/pahimar/ee3/array/AlchemyArrayRegistry.java b/src/main/java/com/pahimar/ee3/array/AlchemyArrayRegistry.java index 42fe4334..57acf4ca 100644 --- a/src/main/java/com/pahimar/ee3/array/AlchemyArrayRegistry.java +++ b/src/main/java/com/pahimar/ee3/array/AlchemyArrayRegistry.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/array/TransmutationAlchemyArray.java b/src/main/java/com/pahimar/ee3/array/TransmutationAlchemyArray.java index ca61fe40..c23d64c4 100644 --- a/src/main/java/com/pahimar/ee3/array/TransmutationAlchemyArray.java +++ b/src/main/java/com/pahimar/ee3/array/TransmutationAlchemyArray.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/block/BlockAlchemyArray.java b/src/main/java/com/pahimar/ee3/block/BlockAlchemyArray.java index 5c3c8076..30b43e61 100644 --- a/src/main/java/com/pahimar/ee3/block/BlockAlchemyArray.java +++ b/src/main/java/com/pahimar/ee3/block/BlockAlchemyArray.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightEventHandler.java index f4246a16..5b4f9deb 100644 --- a/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightEventHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/DrawBlockHighlightEventHandler.java @@ -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.*; diff --git a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java index 56dcef09..e25132b0 100644 --- a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityRendererAlchemyArray.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityRendererAlchemyArray.java index ddfada16..53fb0641 100644 --- a/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityRendererAlchemyArray.java +++ b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityRendererAlchemyArray.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java index 5b65281b..d6d15ec9 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValue.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java index a685743e..474df98c 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetEnergyValueCurrentItem.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetItemLearnable.java b/src/main/java/com/pahimar/ee3/command/CommandSetItemLearnable.java index 5d94ecb2..9780e6a9 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetItemLearnable.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetItemLearnable.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java index b310d5ae..2560b521 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotLearnable.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java index d08e31c3..21dd9e4a 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetItemNotRecoverable.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/command/CommandSetItemRecoverable.java b/src/main/java/com/pahimar/ee3/command/CommandSetItemRecoverable.java index 93733906..050c0b30 100644 --- a/src/main/java/com/pahimar/ee3/command/CommandSetItemRecoverable.java +++ b/src/main/java/com/pahimar/ee3/command/CommandSetItemRecoverable.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java index 7a1431ed..5014ffcf 100644 --- a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java +++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/exchange/EnergyValueStackMapping.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueStackMapping.java index 788e63b4..23296b94 100644 --- a/src/main/java/com/pahimar/ee3/exchange/EnergyValueStackMapping.java +++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueStackMapping.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/init/Abilities.java b/src/main/java/com/pahimar/ee3/init/Abilities.java index c57023c1..f0114661 100644 --- a/src/main/java/com/pahimar/ee3/init/Abilities.java +++ b/src/main/java/com/pahimar/ee3/init/Abilities.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/init/AlchemyArrays.java b/src/main/java/com/pahimar/ee3/init/AlchemyArrays.java index c1494cd7..f3606aa7 100644 --- a/src/main/java/com/pahimar/ee3/init/AlchemyArrays.java +++ b/src/main/java/com/pahimar/ee3/init/AlchemyArrays.java @@ -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 diff --git a/src/main/java/com/pahimar/ee3/init/EnergyValues.java b/src/main/java/com/pahimar/ee3/init/EnergyValues.java index d61fa2c5..a65cb2f9 100644 --- a/src/main/java/com/pahimar/ee3/init/EnergyValues.java +++ b/src/main/java/com/pahimar/ee3/init/EnergyValues.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerTransmutationTablet.java b/src/main/java/com/pahimar/ee3/inventory/ContainerTransmutationTablet.java index fca8806f..f9600038 100644 --- a/src/main/java/com/pahimar/ee3/inventory/ContainerTransmutationTablet.java +++ b/src/main/java/com/pahimar/ee3/inventory/ContainerTransmutationTablet.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalTome.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalTome.java index 80e949aa..9ce62000 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemAlchemicalTome.java +++ b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalTome.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/item/ItemChalk.java b/src/main/java/com/pahimar/ee3/item/ItemChalk.java index 0de706dd..aec05bbf 100644 --- a/src/main/java/com/pahimar/ee3/item/ItemChalk.java +++ b/src/main/java/com/pahimar/ee3/item/ItemChalk.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/knowledge/AbilityRegistry.java b/src/main/java/com/pahimar/ee3/knowledge/AbilityRegistry.java index a168bbac..1017fc82 100644 --- a/src/main/java/com/pahimar/ee3/knowledge/AbilityRegistry.java +++ b/src/main/java/com/pahimar/ee3/knowledge/AbilityRegistry.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/nei/CalcinationHandler.java b/src/main/java/com/pahimar/ee3/nei/CalcinationHandler.java index c2d6e595..d543236e 100644 --- a/src/main/java/com/pahimar/ee3/nei/CalcinationHandler.java +++ b/src/main/java/com/pahimar/ee3/nei/CalcinationHandler.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/network/message/MessageSetEnergyValue.java b/src/main/java/com/pahimar/ee3/network/message/MessageSetEnergyValue.java index d13d3fab..677b3a7d 100644 --- a/src/main/java/com/pahimar/ee3/network/message/MessageSetEnergyValue.java +++ b/src/main/java/com/pahimar/ee3/network/message/MessageSetEnergyValue.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/network/message/MessageSyncEnergyValues.java b/src/main/java/com/pahimar/ee3/network/message/MessageSyncEnergyValues.java index b1ab0ac9..a9a48907 100644 --- a/src/main/java/com/pahimar/ee3/network/message/MessageSyncEnergyValues.java +++ b/src/main/java/com/pahimar/ee3/network/message/MessageSyncEnergyValues.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/recipe/AludelRecipeManager.java b/src/main/java/com/pahimar/ee3/recipe/AludelRecipeManager.java index 707a5b51..c76a9aa3 100644 --- a/src/main/java/com/pahimar/ee3/recipe/AludelRecipeManager.java +++ b/src/main/java/com/pahimar/ee3/recipe/AludelRecipeManager.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/recipe/RecipesFluidContainers.java b/src/main/java/com/pahimar/ee3/recipe/RecipesFluidContainers.java index b0b4a80b..38decfe4 100644 --- a/src/main/java/com/pahimar/ee3/recipe/RecipesFluidContainers.java +++ b/src/main/java/com/pahimar/ee3/recipe/RecipesFluidContainers.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/recipe/RecipesPotions.java b/src/main/java/com/pahimar/ee3/recipe/RecipesPotions.java index 6325254f..1df9d521 100644 --- a/src/main/java/com/pahimar/ee3/recipe/RecipesPotions.java +++ b/src/main/java/com/pahimar/ee3/recipe/RecipesPotions.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/recipe/RecipesVanilla.java b/src/main/java/com/pahimar/ee3/recipe/RecipesVanilla.java index da7d8a93..f690487b 100644 --- a/src/main/java/com/pahimar/ee3/recipe/RecipesVanilla.java +++ b/src/main/java/com/pahimar/ee3/recipe/RecipesVanilla.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/settings/ChalkSettings.java b/src/main/java/com/pahimar/ee3/settings/ChalkSettings.java index 17a47497..35a69e05 100644 --- a/src/main/java/com/pahimar/ee3/settings/ChalkSettings.java +++ b/src/main/java/com/pahimar/ee3/settings/ChalkSettings.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/test/EnergyValueMappingsTestSuite.java b/src/main/java/com/pahimar/ee3/test/EnergyValueMappingsTestSuite.java index 41905623..0f24821c 100644 --- a/src/main/java/com/pahimar/ee3/test/EnergyValueMappingsTestSuite.java +++ b/src/main/java/com/pahimar/ee3/test/EnergyValueMappingsTestSuite.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileEntityAlchemyArray.java b/src/main/java/com/pahimar/ee3/tileentity/TileEntityAlchemyArray.java index 5419ac51..8d4a35c2 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileEntityAlchemyArray.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileEntityAlchemyArray.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/tileentity/TileEntityTransmutationTablet.java b/src/main/java/com/pahimar/ee3/tileentity/TileEntityTransmutationTablet.java index 90e1ca2a..4a51167c 100644 --- a/src/main/java/com/pahimar/ee3/tileentity/TileEntityTransmutationTablet.java +++ b/src/main/java/com/pahimar/ee3/tileentity/TileEntityTransmutationTablet.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/util/CalcinationHelper.java b/src/main/java/com/pahimar/ee3/util/CalcinationHelper.java index 0d7f0206..5753c578 100644 --- a/src/main/java/com/pahimar/ee3/util/CalcinationHelper.java +++ b/src/main/java/com/pahimar/ee3/util/CalcinationHelper.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/util/EnergyValueHelper.java b/src/main/java/com/pahimar/ee3/util/EnergyValueHelper.java index 9ebb655f..e570a846 100644 --- a/src/main/java/com/pahimar/ee3/util/EnergyValueHelper.java +++ b/src/main/java/com/pahimar/ee3/util/EnergyValueHelper.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/util/FilterUtils.java b/src/main/java/com/pahimar/ee3/util/FilterUtils.java index b5107d0a..5d7022e3 100644 --- a/src/main/java/com/pahimar/ee3/util/FilterUtils.java +++ b/src/main/java/com/pahimar/ee3/util/FilterUtils.java @@ -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; diff --git a/src/main/java/com/pahimar/ee3/util/SerializationHelper.java b/src/main/java/com/pahimar/ee3/util/SerializationHelper.java index b45bf84b..5fa4d256 100644 --- a/src/main/java/com/pahimar/ee3/util/SerializationHelper.java +++ b/src/main/java/com/pahimar/ee3/util/SerializationHelper.java @@ -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;