diff --git a/src/main/java/mekanism/api/ItemRetriever.java b/src/main/java/mekanism/api/ItemRetriever.java deleted file mode 100644 index c2820f0bc..000000000 --- a/src/main/java/mekanism/api/ItemRetriever.java +++ /dev/null @@ -1,112 +0,0 @@ -package mekanism.api; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -/** - * Use this class's 'getItem()' method to retrieve ItemStacks from the 'Mekanism' - * class. - * @author AidanBrady - * - */ -public final class ItemRetriever -{ - /** The 'MekanismItems' class that items are retrieved from. */ - private static Class MekanismItems; - - /** The 'MekanismBlocks' class that blocks are retrieved from. */ - private static Class MekanismBlocks; - - /** - * Attempts to retrieve an ItemStack of an item with the declared identifier. - * - * Mekanism identifiers follow an easy-to-remember pattern. All identifiers - * are identical to the String returned by 'getItemName().' None include spaces, - * and all start with a capital letter. The name that shows up in-game can be - * stripped down to identifier form by removing spaces and all non-alphabetic - * characters (,./'=-_). Below is an example: - * - * ItemStack enrichedAlloy = ItemRetriever.getItem("EnrichedAlloy"); - * - * Note that for items or blocks that have specific metadata you will need to create - * a new ItemStack with that specified value, as this will only return an ItemStack - * with the meta value '0.' - * - * Make sure you run this in or after FMLPostInitializationEvent runs, because most - * items are registered when FMLInitializationEvent runs. However, some items ARE - * registered later in order to hook into other mods. In a rare circumstance you may - * have to add "after:Mekanism" in the @Mod 'dependencies' annotation. - * - * @param identifier - a String to be searched in the 'MekanismItems' class - * @return an ItemStack of the declared identifier, otherwise null. - */ - public static ItemStack getItem(String identifier) - { - try { - if(MekanismItems == null) - { - MekanismItems = Class.forName("mekanism.common.MekanismItems"); - } - - Object ret = MekanismItems.getField(identifier).get(null); - - if(ret instanceof Item) - { - return new ItemStack((Item)ret, 1); - } - else { - return null; - } - } catch(Exception e) { - System.err.println("Error retrieving item with identifier '" + identifier + "': " + e.getMessage()); - return null; - } - } - - /** - * Attempts to retrieve an ItemStack of a block with the declared identifier. - * - * Mekanism identifiers follow an easy-to-remember pattern. All identifiers - * are identical to the String returned by 'getItemName().' None include spaces, - * and all start with a capital letter. The name that shows up in-game can be - * stripped down to identifier form by removing spaces and all non-alphabetic - * characters (,./'=-_). Below is an example: - * - * ItemStack enrichedAlloy = ItemRetriever.getItem("EnrichedAlloy"); - * - * Note that for items or blocks that have specific metadata you will need to create - * a new ItemStack with that specified value, as this will only return an ItemStack - * with the meta value '0.' - * - * Make sure you run this in or after FMLPostInitializationEvent runs, because most - * items are registered when FMLInitializationEvent runs. However, some items ARE - * registered later in order to hook into other mods. In a rare circumstance you may - * have to add "after:Mekanism" in the @Mod 'dependencies' annotation. - * - * @param identifier - a String to be searched in the 'MekanismBlocks' class - * @return an ItemStack of the declared identifier, otherwise null. - */ - public static ItemStack getBlock(String identifier) - { - try { - if(MekanismBlocks == null) - { - MekanismBlocks = Class.forName("mekanism.common.MekanismBlocks"); - } - - Object ret = MekanismBlocks.getField(identifier).get(null); - - if(ret instanceof Block) - { - return new ItemStack((Block)ret, 1); - } - else { - return null; - } - } catch(Exception e) { - System.err.println("Error retrieving block with identifier '" + identifier + "': " + e.getMessage()); - return null; - } - } -} diff --git a/src/main/java/mekanism/api/TabProxy.java b/src/main/java/mekanism/api/TabProxy.java deleted file mode 100644 index c562c0247..000000000 --- a/src/main/java/mekanism/api/TabProxy.java +++ /dev/null @@ -1,42 +0,0 @@ -package mekanism.api; - -import net.minecraft.creativetab.CreativeTabs; - -/** - * Class used to indirectly reference the Mekanism creative tab. - * @author AidanBrady - * - */ -public final class TabProxy -{ - /** The 'Mekanism' class where the tab instance is stored. */ - public static Class Mekanism; - - /** - * Attempts to get the Mekanism creative tab instance from the 'Mekanism' class. Will return - * the tab if the mod is loaded, but otherwise will return the defined 'preferred' creative tab. This way - * you don't need to worry about NPEs! - * @return Mekanism creative tab if can, otherwise preferred tab - */ - public static CreativeTabs tabMekanism(CreativeTabs preferred) - { - try { - if(Mekanism == null) - { - Mekanism = Class.forName("mekanism.common.Mekanism"); - } - - Object ret = Mekanism.getField("tabMekanism").get(null); - - if(ret instanceof CreativeTabs) - { - return (CreativeTabs)ret; - } - - return preferred; - } catch(Exception e) { - System.err.println("Error retrieving Mekanism creative tab."); - return preferred; - } - } -} diff --git a/src/main/java/mekanism/api/recipe/RecipeHelper.java b/src/main/java/mekanism/api/recipe/RecipeHelper.java deleted file mode 100644 index a125a8cbb..000000000 --- a/src/main/java/mekanism/api/recipe/RecipeHelper.java +++ /dev/null @@ -1,318 +0,0 @@ -package mekanism.api.recipe; - -import java.lang.reflect.Method; - -import mekanism.api.gas.GasStack; -import mekanism.api.infuse.InfuseType; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -/** - * SET TO BE REMOVED NEXT MINOR MEKANISM VERSION, PLEASE USE IMC INSTEAD. - * Use this handy class to add recipes to Mekanism machinery. - * @author AidanBrady - * - */ -@Deprecated -public final class RecipeHelper -{ - /** - * Add an Enrichment Chamber recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addEnrichmentChamberRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addEnrichmentChamberRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add an Osmium Compressor recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addOsmiumCompressorRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addOsmiumCompressorRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Combiner recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addCombinerRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addCombinerRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Crusher recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addCrusherRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addCrusherRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Purification Chamber recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addPurificationChamberRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addPurificationChamberRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Oxidizer recipe. - * @param input - input ItemStack - * @param output - output GasStack - */ - public static void addChemicalOxidizerRecipe(ItemStack input, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalOxidizerRecipe", ItemStack.class, GasStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Infuser recipe. - * @param leftInput - left input GasStack - * @param rightInput - right input GasStack - * @param output - output GasStack - */ - public static void addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalInfuserRecipe", GasStack.class, GasStack.class, GasStack.class); - m.invoke(null, leftInput, rightInput, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Precision Sawmill recipe. - * @param input - input ItemStack - * @param primaryOutput - guaranteed output - * @param secondaryOutput - possible extra output - * @param chance - probability of obtaining extra output - */ - public static void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class, ItemStack.class, Double.TYPE); - m.invoke(null, input, primaryOutput, secondaryOutput, chance); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Precision Sawmill recipe with no chance output - * @param input - input ItemStack - * @param primaryOutput - guaranteed output - */ - public static void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, primaryOutput); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Injection Chamber recipe. - * @param input - input AdvancedInput - * @param output - output ItemStack - */ - public static void addChemicalInjectionChamberRecipe(ItemStack input, String gasName, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalInjectionChamberRecipe", ItemStack.class, String.class, ItemStack.class); - m.invoke(null, input, gasName, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add an Electrolytic Separator recipe. - * @param input - input FluidStack - * @param energy - required energy - * @param leftOutput - left output GasStack - * @param rightOutput - right output GasStack - */ - public static void addElectrolyticSeparatorRecipe(FluidStack input, double energy, GasStack leftOutput, GasStack rightOutput) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addElectrolyticSeparatorRecipe", FluidStack.class, Double.TYPE, GasStack.class, GasStack.class); - m.invoke(null, input, energy, leftOutput, rightOutput); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Dissolution Chamber recipe. - * @param input - input ItemStack - * @param output - output GasStack - */ - public static void addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalDissolutionChamberRecipe", ItemStack.class, GasStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Washer recipe. - * @param input - input GasStack - * @param output - output GasStack - */ - public static void addChemicalWasherRecipe(GasStack input, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalWasherRecipe", GasStack.class, GasStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Crystallizer recipe. - * @param input - input GasStack - * @param output - output ItemStack - */ - public static void addChemicalCrystallizerRecipe(GasStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalCrystallizerRecipe", GasStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Metallurgic Infuser recipe. - * @param infuse - which Infuse to use - * @param amount - how much Infuse to use - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addMetallurgicInfuserRecipe(InfuseType infuse, int amount, ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addMetallurgicInfuserRecipe", InfuseType.class, Integer.TYPE, ItemStack.class, ItemStack.class); - m.invoke(null, infuse, amount, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Pressurized Reaction Chamber recipe. - * @param inputSolid - input ItemStack - * @param inputFluid - input FluidStack - * @param inputGas - input GasStack - * @param outputSolid - output ItemStack - * @param outputGas - output GasStack - * @param extraEnergy - extra energy needed by the recipe - * @param ticks - amount of ticks it takes for this recipe to complete - */ - public static void addPRCRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double extraEnergy, int ticks) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addPRCRecipe", ItemStack.class, FluidStack.class, GasStack.class, ItemStack.class, GasStack.class, Double.TYPE, Integer.TYPE); - m.invoke(null, inputSolid, inputFluid, inputGas, outputSolid, outputGas, extraEnergy, ticks); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Thermal Evaporation Plant recipe. - * @param input - input GasStack - * @param output - output GasStack - */ - public static void addThermalEvaporationRecipe(FluidStack input, FluidStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addThermalEvaporationRecipe", FluidStack.class, FluidStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Solar Neutron Activator recipe. - * @param input - input GasStack - * @param output - output GasStack - */ - public static void addSolarNeutronRecipe(GasStack input, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addSolarNeutronRecipe", GasStack.class, GasStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } -} diff --git a/src/main/java/mekanism/api/recipe/package-info.java b/src/main/java/mekanism/api/recipe/package-info.java deleted file mode 100644 index 0656c9044..000000000 --- a/src/main/java/mekanism/api/recipe/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@API(apiVersion = "9.0.0", owner = "mekanism", provides = "MekanismAPI|recipe") -package mekanism.api.recipe; -import net.minecraftforge.fml.common.API; - diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index 12f248d58..1e9d0a665 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -2,9 +2,9 @@ package mekanism.client; import java.net.InetSocketAddress; -import mekanism.api.MekanismConfig.general; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig.general; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index db847aa74..9d4590fa8 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -12,8 +12,6 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.client; -import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.client.entity.ParticleLaser; @@ -126,6 +124,8 @@ import mekanism.common.block.states.BlockStateOre.EnumOreType; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockStateMapper; import mekanism.common.block.states.BlockStateTransmitter.TransmitterStateMapper; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; +import mekanism.common.config.MekanismConfig.client; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 50a6091ec..6b0e60257 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -13,14 +13,13 @@ import java.util.Map; import java.util.Set; import mekanism.api.IClientTicker; -import mekanism.api.MekanismConfig.client; -import mekanism.api.ObfuscatedNames; import mekanism.api.gas.GasStack; -import mekanism.api.util.ReflectionUtils; import mekanism.client.sound.SoundHandler; import mekanism.common.CommonPlayerTickHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; +import mekanism.common.ObfuscatedNames; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; import mekanism.common.item.ItemGasMask; @@ -34,6 +33,7 @@ import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.ReflectionUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.network.NetworkPlayerInfo; diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index fceffc0d4..ce81a4c09 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -5,8 +5,8 @@ import java.util.Calendar; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.client; import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig.client; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index be1cf7c34..311ce5f0a 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -5,12 +5,12 @@ import java.util.Map; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; -import mekanism.api.MekanismConfig.general; import mekanism.client.render.obj.TransmitterModel; import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; import mekanism.common.base.IModule; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.network.PacketKey.KeyMessage; import mekanism.common.security.SecurityData; diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 906eb3c35..7cdca1bf9 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -1,7 +1,6 @@ package mekanism.client; import mekanism.api.EnumColor; -import mekanism.api.util.StackUtils; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.MekanismSounds; @@ -25,6 +24,7 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import mekanism.common.util.LangUtils; +import mekanism.common.util.StackUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index 7a30d8930..5466e3c3a 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -5,8 +5,8 @@ import java.util.Random; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.common.MekanismSounds; +import mekanism.common.config.MekanismConfig.general; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index ae8632dd3..2cb5eec36 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.gas.GasStack; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -22,6 +21,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index 063bdb916..215b41256 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -2,22 +2,22 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; -import mekanism.api.util.UnitDisplayUtils; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiBoilerTab; import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiGraph; import mekanism.client.gui.element.GuiGraph.GraphDataHandler; import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.UnitDisplayUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index c334cb19f..282f69e26 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -20,6 +19,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChanceMachine; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 969042a12..30269fd98 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; @@ -28,6 +27,7 @@ import mekanism.common.inventory.container.ContainerChemicalCrystallizer; import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.tile.TileEntityChemicalCrystallizer; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index a299c0241..c8aab21a0 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; @@ -21,6 +20,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index 2208988b3..d235ac86d 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; @@ -21,6 +20,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 9cc16820d..a1b51bcfc 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiGasGauge; @@ -21,6 +20,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index becd2a6a8..950fae1f5 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiBucketIO; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -25,6 +24,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerChemicalWasher; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index b7098f175..ed6e55153 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -27,6 +26,7 @@ import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index e62720f83..96fd2b111 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -20,6 +19,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 21b328da0..64e3ef792 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; @@ -18,6 +17,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index acab2f321..a7245f2c7 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; @@ -31,6 +30,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 3b7823e82..27ee6dd34 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; @@ -18,6 +17,7 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 8b194969d..f215b84ed 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiRecipeType; @@ -25,6 +24,7 @@ import mekanism.common.item.ItemGaugeDropper; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 22380fc34..86137ec1c 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; @@ -18,6 +17,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerFluidicPlenisher; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java index e8035c6d2..07ba2f623 100644 --- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java +++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -25,6 +24,7 @@ import mekanism.common.item.ItemCraftingFormula; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java index e09dadca9..3d2f49bc7 100644 --- a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java +++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java @@ -2,20 +2,20 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; -import mekanism.api.util.UnitDisplayUtils; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.inventory.container.ContainerFuelwoodHeater; import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.UnitDisplayUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index 988c8dc86..747fe2813 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -2,7 +2,6 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiMatrixTab; @@ -11,6 +10,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerInductionMatrix; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 125b7905c..e0559be97 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; @@ -15,6 +14,7 @@ import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 79cae810c..0ff8b79b5 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -27,6 +26,7 @@ import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index 78d68a59f..42fa9351f 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -3,7 +3,6 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; @@ -26,6 +25,7 @@ import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index 2b20a3216..fefe34c32 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -5,10 +5,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; -import mekanism.api.util.UnitDisplayUtils; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiHeatInfo; @@ -20,12 +16,16 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.inventory.container.ContainerResistiveHeater; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.UnitDisplayUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.SoundEvents; diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index a890c25e8..38ad90d36 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiFluidGauge; @@ -29,6 +28,7 @@ import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index 410ab55b4..2598cafc7 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -2,8 +2,6 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.usage; -import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -12,9 +10,11 @@ import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index 72023c8b7..db107dcb8 100644 --- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java @@ -2,20 +2,20 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; -import mekanism.api.util.UnitDisplayUtils; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiHeatInfo; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.UnitDisplayUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index fccc51fd6..ee73f096a 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -2,10 +2,6 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; -import mekanism.api.util.UnitDisplayUtils; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.element.GuiBoilerTab; import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; import mekanism.client.gui.element.GuiElement.IInfoHandler; @@ -14,12 +10,16 @@ import mekanism.client.gui.element.GuiRateBar; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.FluidType; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.tile.TileEntityBoilerCasing; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.UnitDisplayUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/element/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java index 84dcd6e8a..05903233b 100644 --- a/src/main/java/mekanism/client/gui/element/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -3,9 +3,9 @@ package mekanism.client.gui.element; import java.awt.Rectangle; import java.util.List; -import mekanism.api.ObfuscatedNames; -import mekanism.api.util.ReflectionUtils; import mekanism.client.gui.IGuiWrapper; +import mekanism.common.ObfuscatedNames; +import mekanism.common.util.ReflectionUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index 85781de0a..075c77a4f 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -3,12 +3,12 @@ package mekanism.client.gui.element; import java.util.ArrayList; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.client.gui.IGuiWrapper; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.EnergyType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java index 83657dcea..48dbab9b7 100644 --- a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java @@ -3,12 +3,12 @@ package mekanism.client.gui.element; import java.util.ArrayList; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.UnitDisplayUtils.TempType; import mekanism.client.gui.IGuiWrapper; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TempType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index ff2396143..9d58c5562 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -2,12 +2,11 @@ package mekanism.client.gui.element; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; import mekanism.client.MekanismClient; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; @@ -15,6 +14,7 @@ import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.security.SecurityData; import mekanism.common.security.SecurityFrequency; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.SecurityUtils; diff --git a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java index e6265211a..6ae7b20e2 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/ChemicalInjectionChamberRecipeWrapper.java @@ -5,12 +5,12 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; -import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; import mekanism.common.MekanismFluids; import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java index b770154eb..7a95ecded 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/CombinerRecipeWrapper.java @@ -3,10 +3,10 @@ package mekanism.client.jei.machine.advanced; import java.util.List; import mekanism.api.gas.Gas; -import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.util.ListUtils; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java index 11f4eea49..d747c2418 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/OsmiumCompressorRecipeWrapper.java @@ -3,11 +3,11 @@ package mekanism.client.jei.machine.advanced; import java.util.List; import mekanism.api.gas.Gas; -import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; import mekanism.common.MekanismItems; import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.util.ListUtils; import mezz.jei.api.ingredients.IIngredients; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java index f1e6cc850..88409d629 100644 --- a/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/advanced/PurificationChamberRecipeWrapper.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.gas.Gas; -import mekanism.api.util.ListUtils; import mekanism.client.jei.machine.AdvancedMachineRecipeCategory; import mekanism.client.jei.machine.AdvancedMachineRecipeWrapper; import mekanism.common.MekanismFluids; import mekanism.common.Tier.GasTankTier; import mekanism.common.recipe.machines.AdvancedMachineRecipe; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 1bf50009c..70187de84 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -7,20 +7,20 @@ import java.util.List; import java.util.Map; import mekanism.api.EnumColor; -import mekanism.api.ObfuscatedNames; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.ReflectionUtils; import mekanism.client.render.obj.TransmitterModel; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.transmitter.RenderLogisticalTransporter; import mekanism.client.render.transmitter.RenderMechanicalPipe; +import mekanism.common.ObfuscatedNames; import mekanism.common.base.IMetaItem; +import mekanism.common.util.ReflectionUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index 18fa93a90..add01f4b5 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -10,10 +10,10 @@ import java.util.Set; import javax.vecmath.Matrix4f; -import mekanism.api.MekanismConfig.client; import mekanism.client.render.ctm.CTMModelFactory; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.property.PropertyConnection; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.tile.transmitter.TileEntitySidedPipe; import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index ba33ffc79..f6aa2f941 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -3,11 +3,11 @@ package mekanism.client.render.transmitter; import java.util.HashMap; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.client; import mekanism.client.model.ModelTransporterBox; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.item.ItemConfigurator; import mekanism.common.tile.transmitter.TileEntityDiversionTransporter; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 6b18cb722..c98f0d35f 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -2,12 +2,12 @@ package mekanism.client.render.transmitter; import java.util.HashMap; -import mekanism.api.MekanismConfig.client; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.ColourRGBA; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.tile.transmitter.TileEntityMechanicalPipe; import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java index b4833b88e..df6529318 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java @@ -1,8 +1,8 @@ package mekanism.client.render.transmitter; -import mekanism.api.MekanismConfig.client; import mekanism.client.render.MekanismRenderer; import mekanism.common.ColourRGBA; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.tile.transmitter.TileEntityPressurizedTube; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java index 46c15c742..3ff530e68 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java @@ -1,8 +1,8 @@ package mekanism.client.render.transmitter; -import mekanism.api.MekanismConfig.client; import mekanism.client.render.ColourTemperature; import mekanism.client.render.MekanismRenderer; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java index dc1be55f6..500327c58 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java @@ -1,8 +1,8 @@ package mekanism.client.render.transmitter; -import mekanism.api.MekanismConfig.client; import mekanism.client.render.MekanismRenderer; import mekanism.common.ColourRGBA; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.tile.transmitter.TileEntityUniversalCable; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; diff --git a/src/main/java/mekanism/client/sound/MekSound.java b/src/main/java/mekanism/client/sound/MekSound.java index fc487702a..f6380cafc 100644 --- a/src/main/java/mekanism/client/sound/MekSound.java +++ b/src/main/java/mekanism/client/sound/MekSound.java @@ -1,6 +1,6 @@ package mekanism.client.sound; -import mekanism.api.MekanismConfig.client; +import mekanism.common.config.MekanismConfig.client; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.Sound; import net.minecraft.client.audio.SoundEventAccessor; diff --git a/src/main/java/mekanism/client/sound/SoundHandler.java b/src/main/java/mekanism/client/sound/SoundHandler.java index bee0ee822..e7b38ddc0 100644 --- a/src/main/java/mekanism/client/sound/SoundHandler.java +++ b/src/main/java/mekanism/client/sound/SoundHandler.java @@ -3,9 +3,9 @@ package mekanism.client.sound; import java.util.HashMap; import java.util.Map; -import mekanism.api.MekanismConfig.client; -import mekanism.api.ObfuscatedNames; -import mekanism.api.util.ReflectionUtils; +import mekanism.common.ObfuscatedNames; +import mekanism.common.config.MekanismConfig.client; +import mekanism.common.util.ReflectionUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ITickableSound; diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index a95bf7a21..7ccdc92fd 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -9,8 +9,8 @@ import java.net.Socket; import javax.sound.sampled.AudioFormat; -import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig.general; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 5fde96147..6183123c3 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -5,7 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.MekanismAPI; -import mekanism.api.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.tile.TileEntityTeleporter; diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 21a7b316d..ed4cd7c0a 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -1,8 +1,6 @@ package mekanism.common; -import mekanism.api.ObfuscatedNames; import mekanism.api.gas.GasStack; -import mekanism.api.util.ReflectionUtils; import mekanism.common.entity.EntityFlame; import mekanism.common.item.ItemFlamethrower; import mekanism.common.item.ItemFreeRunners; @@ -10,6 +8,7 @@ import mekanism.common.item.ItemGasMask; import mekanism.common.item.ItemJetpack; import mekanism.common.item.ItemJetpack.JetpackMode; import mekanism.common.item.ItemScubaTank; +import mekanism.common.util.ReflectionUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index aa15c7df0..136e30bfa 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -5,17 +5,15 @@ import java.lang.ref.WeakReference; import mekanism.api.Coord4D; import mekanism.api.MekanismAPI; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Pos3D; -import mekanism.api.util.UnitDisplayUtils.EnergyType; -import mekanism.api.util.UnitDisplayUtils.TempType; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.common.base.IGuiProvider; import mekanism.common.base.IUpgradeTile; -import mekanism.common.base.TypeConfigManager; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.config.TypeConfigManager; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerChanceMachine; @@ -120,6 +118,8 @@ import mekanism.common.tile.transmitter.TileEntityPressurizedTube; import mekanism.common.tile.transmitter.TileEntityRestrictiveTransporter; import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor; import mekanism.common.tile.transmitter.TileEntityUniversalCable; +import mekanism.common.util.UnitDisplayUtils.EnergyType; +import mekanism.common.util.UnitDisplayUtils.TempType; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index 5be26dca7..d4fded57b 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -2,8 +2,8 @@ package mekanism.common; import java.util.HashMap; -import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.MekanismUtils; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.ModAPIManager; diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index f6c17b3ff..da681ee8b 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -3,11 +3,11 @@ package mekanism.common; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; import mekanism.api.lasers.ILaserReceptor; -import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.util.CapabilityUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a9a98f40d..8c3692a57 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -14,8 +14,6 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -39,11 +37,13 @@ import mekanism.common.Tier.InductionProviderTier; import mekanism.common.base.IChunkLoadHandler; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IModule; -import mekanism.common.base.TypeConfigManager; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.chunkloading.ChunkManager; +import mekanism.common.config.TypeConfigManager; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.content.matrix.SynchronizedMatrixData; diff --git a/src/main/java/mekanism/api/ObfuscatedNames.java b/src/main/java/mekanism/common/ObfuscatedNames.java similarity index 92% rename from src/main/java/mekanism/api/ObfuscatedNames.java rename to src/main/java/mekanism/common/ObfuscatedNames.java index ca1075a57..ce4fcb920 100644 --- a/src/main/java/mekanism/api/ObfuscatedNames.java +++ b/src/main/java/mekanism/common/ObfuscatedNames.java @@ -1,10 +1,10 @@ -package mekanism.api; +package mekanism.common; public final class ObfuscatedNames { - public static String[] Minecraft_timer = new String[] {"timer", "field_71428_T", "S"}; - public static String[] GuiContainer_xSize = new String[] {"xSize", "field_146999_f", "c"}; - public static String[] GuiContainer_ySize = new String[] {"ySize", "field_147000_g", "d"}; + public static String[] Minecraft_timer = new String[] {"timer", "field_71428_T"}; + public static String[] GuiContainer_xSize = new String[] {"xSize", "field_146999_f"}; + public static String[] GuiContainer_ySize = new String[] {"ySize", "field_147000_g"}; public static String[] GuiContainer_guiLeft = new String[] {"guiLeft", "field_147003_i"}; public static String[] GuiContainer_guiTop = new String[] {"guiTop", "field_147009_r"}; public static String[] NetHandlerPlayServer_floatingTickCount = new String[] {"floatingTickCount", "field_147365_f"}; diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 121a7c9e0..3d4ce2303 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -6,8 +6,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketBoxBlacklist; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; import mekanism.common.network.PacketConfigSync; diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index 892acacee..c7f57a361 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.common.base.IUpgradeTile; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.LangUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 549db0d13..859116807 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -4,10 +4,10 @@ import ic2.api.energy.EnergyNet; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergyTile; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; -import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; import net.darkhax.tesla.api.ITeslaConsumer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index d70387129..4a156d9c1 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -4,7 +4,6 @@ import java.util.Map; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; -import mekanism.api.util.StackUtils; import mekanism.common.InfuseStorage; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.recipe.RecipeHandler; @@ -18,6 +17,7 @@ import mekanism.common.recipe.machines.MachineRecipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; +import mekanism.common.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 9be924b87..afde21ff7 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -5,7 +5,6 @@ import java.util.Random; import mekanism.api.Coord4D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.util.StackUtils; import mekanism.client.render.ctm.CTMBlockRenderContext; import mekanism.client.render.ctm.CTMData; import mekanism.client.render.ctm.ICTMBlock; @@ -38,6 +37,7 @@ import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; +import mekanism.common.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 27ef09b95..c409bcfb2 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -3,10 +3,8 @@ package mekanism.common.block; import java.util.Random; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.client; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.util.StackUtils; import mekanism.client.render.ctm.CTMBlockRenderContext; import mekanism.client.render.ctm.CTMData; import mekanism.client.render.ctm.ICTMBlock; @@ -29,6 +27,7 @@ import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineBlock; import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.item.ItemBlockMachine; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; @@ -48,6 +47,7 @@ import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import mekanism.common.util.SecurityUtils; +import mekanism.common.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index efbdcd466..10806735b 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -5,14 +5,14 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.BaseTier; import mekanism.common.base.IBlockType; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockMachine; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/common/config/MekanismConfig.java similarity index 96% rename from src/main/java/mekanism/api/MekanismConfig.java rename to src/main/java/mekanism/common/config/MekanismConfig.java index b7e04f929..858c92f94 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/common/config/MekanismConfig.java @@ -1,8 +1,7 @@ -package mekanism.api; +package mekanism.common.config; -import mekanism.api.util.UnitDisplayUtils.EnergyType; -import mekanism.api.util.UnitDisplayUtils.TempType; -import mekanism.common.base.TypeConfigManager; +import mekanism.common.util.UnitDisplayUtils.EnergyType; +import mekanism.common.util.UnitDisplayUtils.TempType; public class MekanismConfig { diff --git a/src/main/java/mekanism/common/base/TypeConfigManager.java b/src/main/java/mekanism/common/config/TypeConfigManager.java similarity index 92% rename from src/main/java/mekanism/common/base/TypeConfigManager.java rename to src/main/java/mekanism/common/config/TypeConfigManager.java index 14920be00..056422620 100644 --- a/src/main/java/mekanism/common/base/TypeConfigManager.java +++ b/src/main/java/mekanism/common/config/TypeConfigManager.java @@ -1,9 +1,10 @@ -package mekanism.common.base; +package mekanism.common.config; import java.util.HashMap; import java.util.List; import java.util.Map; +import mekanism.common.base.IBlockType; import net.minecraft.item.crafting.CraftingManager; public class TypeConfigManager diff --git a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java index 5fd182b0f..b088650a1 100644 --- a/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java +++ b/src/main/java/mekanism/common/content/assemblicator/RecipeFormula.java @@ -1,8 +1,8 @@ package mekanism.common.content.assemblicator; -import mekanism.api.util.StackUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.RecipeUtils; +import mekanism.common.util.StackUtils; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 687e5999b..0445fffca 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -7,10 +7,10 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.SynchronizedData; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index e606e9aa6..4514859c4 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -3,7 +3,6 @@ package mekanism.common.content.matrix; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.multiblock.MultiblockCache; @@ -12,6 +11,7 @@ import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityInductionCell; import mekanism.common.tile.TileEntityInductionProvider; +import mekanism.common.util.StackUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index 536137d5a..cf8f11886 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -3,7 +3,6 @@ package mekanism.common.content.tank; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockBasic; @@ -14,6 +13,7 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; +import mekanism.common.util.StackUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/mekanism/common/content/transporter/Finder.java b/src/main/java/mekanism/common/content/transporter/Finder.java index ba80763da..caaf5d89c 100644 --- a/src/main/java/mekanism/common/content/transporter/Finder.java +++ b/src/main/java/mekanism/common/content/transporter/Finder.java @@ -2,9 +2,9 @@ package mekanism.common.content.transporter; import java.util.List; -import mekanism.api.util.StackUtils; import mekanism.common.util.ItemRegistryUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/content/transporter/StackSearcher.java b/src/main/java/mekanism/common/content/transporter/StackSearcher.java index af54ba041..df5ce3a42 100644 --- a/src/main/java/mekanism/common/content/transporter/StackSearcher.java +++ b/src/main/java/mekanism/common/content/transporter/StackSearcher.java @@ -1,7 +1,7 @@ package mekanism.common.content.transporter; -import mekanism.api.util.StackUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.StackUtils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index 9afd4af3d..2bcd66532 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -9,12 +9,12 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.util.StackUtils; import mekanism.common.base.ISideConfiguration; import mekanism.common.content.transporter.TransporterStack.Path; import mekanism.common.tile.TileEntityBin; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 3f8b3c13b..e38d9dea9 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -10,7 +10,6 @@ import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.PathfinderCache.PathData; @@ -19,6 +18,7 @@ import mekanism.common.content.transporter.TransporterStack.Path; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transmitters.grid.InventoryNetwork; import mekanism.common.transmitters.grid.InventoryNetwork.AcceptorData; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/content/transporter/TransporterStack.java b/src/main/java/mekanism/common/content/transporter/TransporterStack.java index 70c7b0b31..7e966b51d 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterStack.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterStack.java @@ -7,12 +7,12 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.util.CapabilityUtils; import mekanism.common.PacketHandler; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterPathfinder.Destination; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 13727fad7..58216c17a 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -5,11 +5,11 @@ import io.netty.buffer.ByteBuf; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; -import mekanism.api.util.StackUtils; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.item.ItemFlamethrower; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java index d92cf84f2..1595bca3a 100644 --- a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java +++ b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java @@ -1,6 +1,6 @@ package mekanism.common.entity; -import mekanism.api.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.general; import net.minecraft.entity.Entity; import net.minecraft.entity.MoverType; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 35ed3fd1f..d7d1686b6 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -8,13 +8,13 @@ import java.math.RoundingMode; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.base.ISustainedInventory; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.entity.ai.RobitAIFollow; import mekanism.common.entity.ai.RobitAIPickup; import mekanism.common.item.ItemConfigurator; diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index cbf575d8b..80fe02f66 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -11,7 +11,6 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.MekanismItems; @@ -19,6 +18,7 @@ import mekanism.common.Resource; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; diff --git a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyCableIntegration.java b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyCableIntegration.java index 0ccf1ffe1..b5f0e85f5 100644 --- a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyCableIntegration.java +++ b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyCableIntegration.java @@ -1,6 +1,6 @@ package mekanism.common.integration.forgeenergy; -import mekanism.api.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.tile.transmitter.TileEntityUniversalCable; import net.minecraft.util.EnumFacing; import net.minecraftforge.energy.IEnergyStorage; diff --git a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyIntegration.java b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyIntegration.java index 29c46cec3..86dfd217a 100644 --- a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyIntegration.java +++ b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyIntegration.java @@ -1,7 +1,7 @@ package mekanism.common.integration.forgeenergy; -import mekanism.api.MekanismConfig.general; import mekanism.common.base.IEnergyWrapper; +import mekanism.common.config.MekanismConfig.general; import net.minecraft.util.EnumFacing; import net.minecraftforge.energy.IEnergyStorage; diff --git a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyItemWrapper.java b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyItemWrapper.java index 6b822d0fb..046e6630f 100644 --- a/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyItemWrapper.java +++ b/src/main/java/mekanism/common/integration/forgeenergy/ForgeEnergyItemWrapper.java @@ -1,8 +1,8 @@ package mekanism.common.integration.forgeenergy; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.capabilities.ItemCapabilityWrapper.ItemCapability; +import mekanism.common.config.MekanismConfig.general; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; diff --git a/src/main/java/mekanism/common/integration/ic2/IC2Integration.java b/src/main/java/mekanism/common/integration/ic2/IC2Integration.java index dad6560ff..a0146caac 100644 --- a/src/main/java/mekanism/common/integration/ic2/IC2Integration.java +++ b/src/main/java/mekanism/common/integration/ic2/IC2Integration.java @@ -4,8 +4,8 @@ import ic2.api.energy.EnergyNet; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import ic2.api.energy.tile.IEnergyTile; -import mekanism.api.MekanismConfig.general; import mekanism.common.base.IEnergyWrapper; +import mekanism.common.config.MekanismConfig.general; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.Optional.Method; diff --git a/src/main/java/mekanism/common/integration/ic2/IC2ItemManager.java b/src/main/java/mekanism/common/integration/ic2/IC2ItemManager.java index 88f85e140..aeef7604a 100644 --- a/src/main/java/mekanism/common/integration/ic2/IC2ItemManager.java +++ b/src/main/java/mekanism/common/integration/ic2/IC2ItemManager.java @@ -1,8 +1,8 @@ package mekanism.common.integration.ic2; import ic2.api.item.IElectricItemManager; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.config.MekanismConfig.general; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java b/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java index 931eaf112..878a1d6f1 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaCableIntegration.java @@ -1,6 +1,6 @@ package mekanism.common.integration.tesla; -import mekanism.api.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.tile.transmitter.TileEntityUniversalCable; import net.darkhax.tesla.api.ITeslaConsumer; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java b/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java index 6a9f5cd07..a601e9a1c 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaIntegration.java @@ -1,7 +1,7 @@ package mekanism.common.integration.tesla; -import mekanism.api.MekanismConfig.general; import mekanism.common.base.IEnergyWrapper; +import mekanism.common.config.MekanismConfig.general; import net.darkhax.tesla.api.ITeslaConsumer; import net.darkhax.tesla.api.ITeslaHolder; import net.darkhax.tesla.api.ITeslaProducer; diff --git a/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java b/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java index 3ff3e4385..7c042d4e5 100644 --- a/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java +++ b/src/main/java/mekanism/common/integration/tesla/TeslaItemWrapper.java @@ -1,9 +1,9 @@ package mekanism.common.integration.tesla; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.ItemCapabilityWrapper.ItemCapability; +import mekanism.common.config.MekanismConfig.general; import net.darkhax.tesla.api.ITeslaConsumer; import net.darkhax.tesla.api.ITeslaHolder; import net.darkhax.tesla.api.ITeslaProducer; diff --git a/src/main/java/mekanism/common/inventory/InventoryBin.java b/src/main/java/mekanism/common/inventory/InventoryBin.java index 81a2527c8..360a95a51 100644 --- a/src/main/java/mekanism/common/inventory/InventoryBin.java +++ b/src/main/java/mekanism/common/inventory/InventoryBin.java @@ -1,11 +1,11 @@ package mekanism.common.inventory; -import mekanism.api.util.StackUtils; import mekanism.common.Tier.BinTier; import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; +import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/item/ItemAlloy.java b/src/main/java/mekanism/common/item/ItemAlloy.java index 0952825ac..b043dee15 100644 --- a/src/main/java/mekanism/common/item/ItemAlloy.java +++ b/src/main/java/mekanism/common/item/ItemAlloy.java @@ -1,10 +1,10 @@ package mekanism.common.item; import mekanism.api.IAlloyInteraction; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.CapabilityUtils; import mekanism.common.MekanismItems; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.util.CapabilityUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index ecc3718ea..5158c4fe7 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -10,10 +10,10 @@ import com.google.common.collect.Multimap; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 1d385b0c2..9508b5435 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -8,7 +8,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; import mekanism.api.transmitters.TransmissionType; @@ -21,6 +20,7 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.capabilities.ItemCapabilityWrapper; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 58b5cdf6b..5dea2da40 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -5,7 +5,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -19,6 +18,7 @@ import mekanism.common.Tier.GasTankTier; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 4040275d7..ab639c3cf 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -9,7 +9,6 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; @@ -31,6 +30,7 @@ import mekanism.common.base.ITierItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.ItemCapabilityWrapper; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 9c1788384..cd4798933 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -4,12 +4,12 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess.ISpecialConfigData; -import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.capabilities.Capabilities; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.SecurityUtils; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index eb5b39fec..7c40d59a8 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -11,7 +11,6 @@ import mekanism.api.IConfigurable; import mekanism.api.IMekWrench; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; @@ -20,6 +19,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index f24f638e1..be5b11559 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -6,10 +6,10 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.capabilities.ItemCapabilityWrapper; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index 40960e460..a3b39236e 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -3,11 +3,11 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.MekanismFluids; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index ad3014992..49574a28c 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -6,12 +6,12 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.capabilities.ItemCapabilityWrapper; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 6d0c62fd8..05d9efd39 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -3,7 +3,6 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; @@ -12,6 +11,7 @@ import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.MekanismItems; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 724514acc..944524eea 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -10,8 +10,8 @@ import mekanism.api.MekanismAPI; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; -import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; +import mekanism.common.util.CapabilityUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index b30c8f9f8..84b01c6e2 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -3,7 +3,6 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; @@ -11,6 +10,7 @@ import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 7017fa159..7de25cc59 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -1,15 +1,15 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; -import mekanism.api.util.UnitDisplayUtils.EnergyType; import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.base.IModule; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; +import mekanism.common.util.UnitDisplayUtils.EnergyType; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 895fae48e..df1bc6cde 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ISideConfiguration; @@ -16,6 +15,7 @@ import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 3a4cdb07a..356f83f44 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; @@ -14,6 +13,7 @@ import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMultiblock; +import mekanism.common.util.CapabilityUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java index ba9a47138..9463baa15 100644 --- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java +++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java @@ -6,10 +6,9 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ObfuscatedNames; import mekanism.api.Range4D; -import mekanism.api.util.ReflectionUtils; import mekanism.common.Mekanism; +import mekanism.common.ObfuscatedNames; import mekanism.common.PacketHandler; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; @@ -17,6 +16,7 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; import mekanism.common.network.PacketPortalFX.PortalFXMessage; import mekanism.common.tile.TileEntityTeleporter; +import mekanism.common.util.ReflectionUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.SoundEvents; diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index 81859c37b..81fefe9b5 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -5,11 +5,11 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.PacketHandler; import mekanism.common.base.ITileNetwork; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.CapabilityUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index d98b5fe86..ca59d63eb 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -6,7 +6,6 @@ import java.util.Collection; import java.util.HashSet; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.client; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -14,14 +13,15 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.PacketHandler; import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; import mekanism.common.transmitters.grid.EnergyNetwork; import mekanism.common.transmitters.grid.FluidNetwork; import mekanism.common.transmitters.grid.GasNetwork; +import mekanism.common.util.CapabilityUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java index c570f6fa8..76ab0af28 100644 --- a/src/main/java/mekanism/common/recipe/RecipeHandler.java +++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java @@ -8,7 +8,6 @@ import java.util.Set; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfuseType; -import mekanism.api.util.StackUtils; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.inputs.ChemicalPairInput; @@ -49,6 +48,7 @@ import mekanism.common.recipe.outputs.GasOutput; import mekanism.common.recipe.outputs.ItemStackOutput; import mekanism.common.recipe.outputs.MachineOutput; import mekanism.common.recipe.outputs.PressurizedOutput; +import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java b/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java index 48d0891a0..4abed4027 100644 --- a/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/AdvancedMachineInput.java @@ -2,8 +2,8 @@ package mekanism.common.recipe.inputs; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; -import mekanism.api.util.StackUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/common/recipe/inputs/InfusionInput.java b/src/main/java/mekanism/common/recipe/inputs/InfusionInput.java index 0a34c1492..e40952e08 100644 --- a/src/main/java/mekanism/common/recipe/inputs/InfusionInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/InfusionInput.java @@ -2,9 +2,9 @@ package mekanism.common.recipe.inputs; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; -import mekanism.api.util.StackUtils; import mekanism.common.InfuseStorage; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/common/recipe/inputs/ItemStackInput.java b/src/main/java/mekanism/common/recipe/inputs/ItemStackInput.java index 67eedeaac..0d268bfe2 100644 --- a/src/main/java/mekanism/common/recipe/inputs/ItemStackInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/ItemStackInput.java @@ -1,7 +1,7 @@ package mekanism.common.recipe.inputs; -import mekanism.api.util.StackUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/common/recipe/inputs/MachineInput.java b/src/main/java/mekanism/common/recipe/inputs/MachineInput.java index f09301f21..fe23e05f1 100644 --- a/src/main/java/mekanism/common/recipe/inputs/MachineInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/MachineInput.java @@ -1,7 +1,7 @@ package mekanism.common.recipe.inputs; -import mekanism.api.util.StackUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java b/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java index b2aac2cda..ae6ba0296 100644 --- a/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java @@ -2,8 +2,8 @@ package mekanism.common.recipe.inputs; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; -import mekanism.api.util.StackUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/common/recipe/outputs/ChanceOutput.java b/src/main/java/mekanism/common/recipe/outputs/ChanceOutput.java index 589d690e2..4121f463d 100644 --- a/src/main/java/mekanism/common/recipe/outputs/ChanceOutput.java +++ b/src/main/java/mekanism/common/recipe/outputs/ChanceOutput.java @@ -2,8 +2,8 @@ package mekanism.common.recipe.outputs; import java.util.Random; -import mekanism.api.util.StackUtils; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java index 5b7c68f73..209a18f9d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicBlock.java @@ -7,7 +7,6 @@ import java.util.HashSet; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IChunkLoadHandler; @@ -16,6 +15,7 @@ import mekanism.common.base.ITileNetwork; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.frequency.IFrequencyHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index d9d1b058b..893cccfa4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -7,7 +7,6 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.IConfigCardAccess; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; @@ -17,6 +16,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.inputs.MachineInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 085d4a5e4..c53b7a1e8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -7,8 +7,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.Tier.BaseTier; @@ -20,9 +18,11 @@ import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.item.ItemBlockBasic; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java index 72f701160..e3f9cfd2b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerValve.java @@ -1,12 +1,12 @@ package mekanism.common.tile; import mekanism.api.Coord4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.content.boiler.BoilerSteamTank; import mekanism.common.content.boiler.BoilerTank; import mekanism.common.content.boiler.BoilerWaterTank; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 4f51405c3..953d1b674 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -10,13 +10,13 @@ import java.util.List; import java.util.Random; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 147c2f16d..04d7e497f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -7,8 +7,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -28,6 +26,8 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 7822f1908..4329cda52 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -5,8 +5,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -15,7 +13,6 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.Upgrade; @@ -25,6 +22,8 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; @@ -37,6 +36,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.StatUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index ca32ed4c7..b36fbed2e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -6,8 +6,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -16,7 +14,6 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; @@ -26,6 +23,8 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ChemicalPairInput; @@ -37,6 +36,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index 8473b2e40..d1fff7527 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -3,7 +3,6 @@ package mekanism.common.tile; import java.util.Map; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -13,6 +12,7 @@ import mekanism.common.MekanismBlocks; import mekanism.common.MekanismFluids; import mekanism.common.SideData; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.InjectionRecipe; import mekanism.common.util.GasUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 71017a40f..bbc013205 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -5,15 +5,12 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; @@ -22,6 +19,8 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; @@ -33,6 +32,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 5287ea486..9334d19d8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -6,8 +6,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -16,7 +14,6 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.Upgrade; @@ -29,6 +26,8 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; @@ -42,6 +41,7 @@ import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityCombiner.java b/src/main/java/mekanism/common/tile/TileEntityCombiner.java index 1ee61eb17..f396411a0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCombiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityCombiner.java @@ -2,11 +2,11 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.common.MekanismFluids; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CombinerRecipe; import net.minecraft.block.Block; diff --git a/src/main/java/mekanism/common/tile/TileEntityCrusher.java b/src/main/java/mekanism/common/tile/TileEntityCrusher.java index 04c7a680a..4241efaf2 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCrusher.java +++ b/src/main/java/mekanism/common/tile/TileEntityCrusher.java @@ -2,8 +2,8 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.MekanismConfig.usage; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CrusherRecipe; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 13b8da7aa..e48e22ebe 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -15,9 +15,7 @@ import java.util.stream.Collectors; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.HashList; import mekanism.common.Mekanism; import mekanism.common.Upgrade; @@ -29,6 +27,7 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; import mekanism.common.chunkloading.IChunkLoader; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.content.miner.MItemStackFilter; import mekanism.common.content.miner.MOreDictFilter; import mekanism.common.content.miner.MinerFilter; @@ -42,6 +41,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentChunkLoader; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 85ebe018b..9a5f9c0cd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -12,13 +12,13 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration; import mekanism.common.integration.tesla.TeslaIntegration; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index b1ffc6d13..da9b1451e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -13,9 +13,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; -import mekanism.api.util.CapabilityUtils; import mekanism.common.MekanismFluids; import mekanism.common.Upgrade; import mekanism.common.base.FluidHandlerWrapper; @@ -25,10 +22,13 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.integration.IComputerIntegration; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 4549d4b44..078eba22d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -15,7 +14,6 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.Upgrade; @@ -29,6 +27,7 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; @@ -45,6 +44,7 @@ import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java index d7f069692..2baa6aea6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java @@ -2,8 +2,8 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.MekanismConfig.usage; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SmeltingRecipe; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java index 3394391a7..90d1ade02 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java @@ -2,8 +2,8 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.MekanismConfig.usage; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.EnrichmentRecipe; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index d1748c918..49027907a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -9,8 +9,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess.ISpecialConfigData; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -21,7 +19,6 @@ import mekanism.api.gas.ITubeConnection; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.StackUtils; import mekanism.client.HolidayManager; import mekanism.common.InfuseStorage; import mekanism.common.Mekanism; @@ -41,6 +38,8 @@ import mekanism.common.base.SoundWrapper; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; @@ -59,6 +58,7 @@ import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import mekanism.common.util.StatUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java index 76d0022f1..24681c252 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidTank.java @@ -6,9 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.Tier.BaseTier; @@ -21,11 +19,13 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.base.ITankManager; import mekanism.common.base.ITierUpgradeable; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 65f2a404e..ecc0c546a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -10,8 +10,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.common.Upgrade; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; @@ -20,6 +18,8 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.integration.IComputerIntegration; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java index b9c0baad9..043db4972 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java +++ b/src/main/java/mekanism/common/tile/TileEntityFormulaicAssemblicator.java @@ -6,9 +6,7 @@ import java.util.ArrayList; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess; -import mekanism.api.MekanismConfig.usage; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.StackUtils; import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.Upgrade; @@ -17,6 +15,7 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.content.assemblicator.RecipeFormula; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.security.ISecurityTile; @@ -27,6 +26,7 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.StackUtils; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java index 2efa40efb..a2ced72ab 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java @@ -6,15 +6,15 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index d90d1a751..2f4e98f1b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -15,18 +15,18 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration; import mekanism.common.integration.tesla.TeslaIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index e5fafd13c..452cbaf57 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -6,14 +6,14 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.lasers.ILaserReceptor; import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 772d7264e..440b30a64 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -5,7 +5,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.lasers.ILaserReceptor; @@ -14,6 +13,7 @@ import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index 98d36a70b..3cf0822e8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -6,17 +6,17 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.lasers.ILaserReceptor; -import mekanism.api.util.StackUtils; import mekanism.common.LaserManager; import mekanism.common.LaserManager.LaserInfo; import mekanism.common.Mekanism; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.InventoryUtils; +import mekanism.common.util.StackUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java index eebd14740..e3759324e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java +++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -8,9 +8,7 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess.ISpecialConfigData; -import mekanism.api.MekanismConfig.client; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.HashList; import mekanism.common.Mekanism; import mekanism.common.MekanismSounds; @@ -20,6 +18,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.content.transporter.Finder.FirstFinder; import mekanism.common.content.transporter.InvStack; import mekanism.common.content.transporter.StackSearcher; @@ -29,6 +28,7 @@ import mekanism.common.content.transporter.TransporterManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index bb34468df..cec6e8e2e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -7,8 +7,6 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigCardAccess; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; @@ -28,6 +26,8 @@ import mekanism.common.base.ITierUpgradeable; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java index 745b6d68f..6d230278a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java @@ -1,6 +1,5 @@ package mekanism.common.tile; -import mekanism.api.MekanismConfig.client; import mekanism.client.HolidayManager; import mekanism.client.sound.ISoundSource; import mekanism.common.Upgrade; @@ -8,6 +7,7 @@ import mekanism.common.base.IActiveState; import mekanism.common.base.IHasSound; import mekanism.common.base.IUpgradeTile; import mekanism.common.base.SoundWrapper; +import mekanism.common.config.MekanismConfig.client; import net.minecraft.client.audio.ISound.AttenuationType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index 25189fb81..fec8a2f41 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -2,11 +2,11 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.common.MekanismFluids; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.OsmiumCompressorRecipe; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index b6d3f34c9..69d737020 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.Map; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -23,6 +22,7 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.item.ItemUpgrade; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.PressurizedInput; diff --git a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java index 3deaa5280..df05affeb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java +++ b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java @@ -2,8 +2,8 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.MekanismConfig.usage; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SawmillRecipe; diff --git a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java index 739c9fb19..bbda6f288 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java @@ -2,13 +2,13 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismFluids; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.PurificationRecipe; import mekanism.common.util.GasUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index 6dac77767..f5516cba9 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -13,7 +13,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.SideData.IOState; @@ -32,6 +31,7 @@ import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.CableUtils; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java index c443ee7a9..84dc1b1af 100644 --- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java +++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java @@ -7,17 +7,17 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index a1b6d2db8..bb7e8ba55 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -6,8 +6,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -15,7 +13,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; @@ -28,6 +25,8 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; @@ -36,6 +35,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.ItemDataUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.PipeUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 31eb5aa50..e7e9836ae 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -6,14 +6,14 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index c37532f60..e973164b8 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -14,7 +13,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.ListUtils; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; @@ -25,6 +23,7 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.base.IUpgradeTile; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; @@ -34,6 +33,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.GasUtils; import mekanism.common.util.ItemDataUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 5c16d5940..eadd247ea 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -11,11 +11,10 @@ import java.util.UUID; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; -import mekanism.api.ObfuscatedNames; import mekanism.api.Range4D; -import mekanism.api.util.ReflectionUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; +import mekanism.common.ObfuscatedNames; import mekanism.common.PacketHandler; import mekanism.common.Upgrade; import mekanism.common.base.IRedstoneControl; @@ -35,6 +34,7 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.ReflectionUtils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 8ec812eb5..756d86b36 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -8,21 +8,21 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.IEvaporationSolar; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; import mekanism.client.SparkleAnimation.INodeChecker; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IActiveState; import mekanism.common.base.ITankManager; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.machines.ThermalEvaporationRecipe; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.FluidChecker; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java index b25d34500..1a1cff9ca 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java @@ -7,12 +7,12 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeTile; import mekanism.common.chunkloading.IChunkLoader; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index cf9bdce58..cb938eaf3 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -12,7 +12,6 @@ import mekanism.api.EnumColor; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ITankManager; @@ -20,6 +19,7 @@ import mekanism.common.base.ITileComponent; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java index 56d676cff..50dc1bd4d 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -5,10 +5,10 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.ITileComponent; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.security.ISecurityTile.SecurityMode; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index 415c63254..3f3f2ff96 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -9,7 +9,6 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; @@ -25,6 +24,7 @@ import mekanism.common.content.transporter.TransporterStack; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.transmitters.TransporterImpl; import mekanism.common.transmitters.grid.InventoryNetwork; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java index b25824c4f..b54da60df 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityMechanicalPipe.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.Collection; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.PipeTier; @@ -16,6 +15,7 @@ import mekanism.common.block.states.BlockStateTransmitter; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.CapabilityWrapperManager; import mekanism.common.transmitters.grid.FluidNetwork; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.PipeUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java index 39bc9de43..a6aab2842 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java @@ -10,7 +10,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.TubeTier; @@ -18,6 +17,7 @@ import mekanism.common.block.states.BlockStateTransmitter; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.grid.GasNetwork; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.GasUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java index fc4d07195..e614a2ce6 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntitySidedPipe.java @@ -13,7 +13,6 @@ import mekanism.api.Range4D; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.base.ITileNetwork; @@ -23,6 +22,7 @@ import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType.Size; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MultipartUtils; import mekanism.common.util.MultipartUtils.AdvancedRayTraceResult; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java index 2f7f57e4b..c40ee9e78 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java @@ -9,7 +9,6 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.ColourRGBA; import mekanism.common.Mekanism; import mekanism.common.Tier; @@ -20,6 +19,7 @@ import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.transmitters.grid.HeatNetwork; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.HeatUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index 0624657c6..f3d8cd364 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -9,12 +9,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergyStack; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Tier; import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.CableTier; @@ -22,10 +20,12 @@ import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyCableIntegration; import mekanism.common.integration.tesla.TeslaCableIntegration; import mekanism.common.transmitters.grid.EnergyNetwork; import mekanism.common.util.CableUtils; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; import net.darkhax.tesla.api.ITeslaProducer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/transmitters/TransmitterImpl.java b/src/main/java/mekanism/common/transmitters/TransmitterImpl.java index 7b607f952..d7ea725f6 100644 --- a/src/main/java/mekanism/common/transmitters/TransmitterImpl.java +++ b/src/main/java/mekanism/common/transmitters/TransmitterImpl.java @@ -6,9 +6,9 @@ import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import mekanism.common.tile.transmitter.TileEntityTransmitter; +import mekanism.common.util.CapabilityUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/transmitters/TransporterImpl.java b/src/main/java/mekanism/common/transmitters/TransporterImpl.java index 31c149049..efafe1923 100644 --- a/src/main/java/mekanism/common/transmitters/TransporterImpl.java +++ b/src/main/java/mekanism/common/transmitters/TransporterImpl.java @@ -6,7 +6,6 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.HashList; import mekanism.common.Mekanism; import mekanism.common.base.ILogisticalTransporter; @@ -19,6 +18,7 @@ import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter; import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType; import mekanism.common.transmitters.grid.InventoryNetwork; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; diff --git a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java index 9e3e42db4..2c73efbb6 100644 --- a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java @@ -11,7 +11,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.util.CapabilityUtils; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java b/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java index f5b94e145..5a49bd8d8 100644 --- a/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java @@ -13,8 +13,8 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; +import mekanism.common.util.CapabilityUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/mekanism/common/transmitters/grid/HeatNetwork.java b/src/main/java/mekanism/common/transmitters/grid/HeatNetwork.java index aaf0812f2..8fbed9812 100644 --- a/src/main/java/mekanism/common/transmitters/grid/HeatNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/HeatNetwork.java @@ -7,11 +7,11 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.TransmitterImpl; //import mekanism.common.multipart.MultipartTransmitter; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import net.minecraftforge.fml.common.FMLCommonHandler; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 965c1078d..6eeffd0d0 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -5,13 +5,12 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.CapabilityUtils; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.ic2.IC2Integration; import net.darkhax.tesla.api.ITeslaConsumer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/api/util/CapabilityUtils.java b/src/main/java/mekanism/common/util/CapabilityUtils.java similarity index 95% rename from src/main/java/mekanism/api/util/CapabilityUtils.java rename to src/main/java/mekanism/common/util/CapabilityUtils.java index 06888cff8..be7c4ea8d 100644 --- a/src/main/java/mekanism/api/util/CapabilityUtils.java +++ b/src/main/java/mekanism/common/util/CapabilityUtils.java @@ -1,4 +1,4 @@ -package mekanism.api.util; +package mekanism.common.util; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index 4a1bf4852..ce4b9a678 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -4,11 +4,11 @@ import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.tile.TileEntityContainerBlock; import net.darkhax.tesla.api.ITeslaConsumer; import net.darkhax.tesla.api.ITeslaProducer; diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index 51b74e6a7..063e6a31c 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -1,6 +1,5 @@ package mekanism.common.util; -import mekanism.api.util.StackUtils; import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/util/GasUtils.java b/src/main/java/mekanism/common/util/GasUtils.java index b9dc66eb6..0e34bba32 100644 --- a/src/main/java/mekanism/common/util/GasUtils.java +++ b/src/main/java/mekanism/common/util/GasUtils.java @@ -11,7 +11,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/util/HeatUtils.java b/src/main/java/mekanism/common/util/HeatUtils.java index 968cc873c..f711f7589 100644 --- a/src/main/java/mekanism/common/util/HeatUtils.java +++ b/src/main/java/mekanism/common/util/HeatUtils.java @@ -1,7 +1,6 @@ package mekanism.common.util; import mekanism.api.IHeatTransfer; -import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.ICapabilityProvider; diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index 6a512beb8..bf7960e68 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -1,7 +1,6 @@ package mekanism.common.util; import mekanism.api.EnumColor; -import mekanism.api.util.StackUtils; import mekanism.common.base.ISideConfiguration; import mekanism.common.content.transporter.Finder; import mekanism.common.content.transporter.InvStack; diff --git a/src/main/java/mekanism/api/util/ListUtils.java b/src/main/java/mekanism/common/util/ListUtils.java similarity index 99% rename from src/main/java/mekanism/api/util/ListUtils.java rename to src/main/java/mekanism/common/util/ListUtils.java index e20807c53..2efc7a658 100644 --- a/src/main/java/mekanism/api/util/ListUtils.java +++ b/src/main/java/mekanism/common/util/ListUtils.java @@ -1,4 +1,4 @@ -package mekanism.api.util; +package mekanism.common.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 76db33483..815661a2d 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -17,14 +17,9 @@ import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IMekWrench; -import mekanism.api.MekanismConfig.client; -import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.transmitters.TransmissionType; -import mekanism.api.util.UnitDisplayUtils; -import mekanism.api.util.UnitDisplayUtils.ElectricUnit; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismFluids; @@ -49,6 +44,8 @@ import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine.MachineType; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; +import mekanism.common.config.MekanismConfig.client; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.inventory.InventoryPersonalChest; import mekanism.common.inventory.container.ContainerPersonalChest; import mekanism.common.item.ItemBlockBasic; @@ -61,6 +58,8 @@ import mekanism.common.network.PacketPersonalChest.PersonalChestPacketType; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.util.UnitDisplayUtils.ElectricUnit; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index ece059807..2535b4b59 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.util.ListUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index 5b33e5f1c..aaa1156bc 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -5,7 +5,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import mekanism.api.util.CapabilityUtils; import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 69ea277ff..997455546 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -9,7 +9,6 @@ import java.util.Map; import mekanism.api.energy.IEnergizedItem; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; -import mekanism.api.util.StackUtils; import mekanism.common.Upgrade; import mekanism.common.base.IFactory; import mekanism.common.base.ITierItem; diff --git a/src/main/java/mekanism/api/util/ReflectionUtils.java b/src/main/java/mekanism/common/util/ReflectionUtils.java similarity index 98% rename from src/main/java/mekanism/api/util/ReflectionUtils.java rename to src/main/java/mekanism/common/util/ReflectionUtils.java index 459ddf84c..36e57c44b 100644 --- a/src/main/java/mekanism/api/util/ReflectionUtils.java +++ b/src/main/java/mekanism/common/util/ReflectionUtils.java @@ -1,4 +1,4 @@ -package mekanism.api.util; +package mekanism.common.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/mekanism/api/util/StackUtils.java b/src/main/java/mekanism/common/util/StackUtils.java similarity index 99% rename from src/main/java/mekanism/api/util/StackUtils.java rename to src/main/java/mekanism/common/util/StackUtils.java index affa2b5e2..de037dfb3 100644 --- a/src/main/java/mekanism/api/util/StackUtils.java +++ b/src/main/java/mekanism/common/util/StackUtils.java @@ -1,4 +1,4 @@ -package mekanism.api.util; +package mekanism.common.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index 919b73b2f..86632eab5 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -4,8 +4,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.util.CapabilityUtils; -import mekanism.api.util.ListUtils; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; diff --git a/src/main/java/mekanism/api/util/UnitDisplayUtils.java b/src/main/java/mekanism/common/util/UnitDisplayUtils.java similarity index 99% rename from src/main/java/mekanism/api/util/UnitDisplayUtils.java rename to src/main/java/mekanism/common/util/UnitDisplayUtils.java index c4ce5cbc5..560d9e4eb 100644 --- a/src/main/java/mekanism/api/util/UnitDisplayUtils.java +++ b/src/main/java/mekanism/common/util/UnitDisplayUtils.java @@ -1,4 +1,4 @@ -package mekanism.api.util; +package mekanism.common.util; /** * Code taken from UE and modified to fit Mekanism. diff --git a/src/main/java/mekanism/common/voice/VoiceServerManager.java b/src/main/java/mekanism/common/voice/VoiceServerManager.java index eac64775d..cc4453492 100644 --- a/src/main/java/mekanism/common/voice/VoiceServerManager.java +++ b/src/main/java/mekanism/common/voice/VoiceServerManager.java @@ -6,8 +6,8 @@ import java.net.SocketException; import java.util.HashSet; import java.util.Set; -import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig.general; public class VoiceServerManager { diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 4e7d03ab7..b8fe19751 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -2,8 +2,8 @@ package mekanism.common.world; import java.util.Random; -import mekanism.api.MekanismConfig.general; import mekanism.common.MekanismBlocks; +import mekanism.common.config.MekanismConfig.general; import net.minecraft.block.state.pattern.BlockMatcher; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 9df59314b..6943c3e06 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -2,8 +2,6 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.generators; -import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -13,7 +11,9 @@ import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 8209ab1a8..6993c6824 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.client.gui; import java.util.List; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -17,6 +16,7 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index fd7729b94..c763535bb 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -2,10 +2,6 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.util.ListUtils; -import mekanism.api.util.UnitDisplayUtils; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -19,9 +15,13 @@ import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; +import mekanism.common.util.UnitDisplayUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 064a7ea81..7b485ac41 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -5,9 +5,6 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.generators; -import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -18,10 +15,13 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiTurbineTab; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 1a47e2d74..511179fdd 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -3,13 +3,13 @@ package mekanism.generators.client.gui; import java.util.ArrayList; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiFuelTab; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 40fcd313f..53e8b53a6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -6,7 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; -import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -22,6 +21,7 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiHeatTab; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index 390bd365e..4fe494ec4 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -6,8 +6,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.util.ListUtils; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyGauge; @@ -28,8 +26,10 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import mekanism.generators.client.gui.element.GuiFuelTab; import mekanism.generators.client.gui.element.GuiStatTab; import mekanism.generators.common.tile.reactor.TileEntityReactorController; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index d7f75e735..a538404d3 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -7,8 +7,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.util.ListUtils; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -17,8 +15,10 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import mekanism.generators.client.gui.element.GuiFuelTab; import mekanism.generators.client.gui.element.GuiHeatTab; import mekanism.generators.common.tile.reactor.TileEntityReactorController; diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 4ebe70202..3692534e6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -2,7 +2,6 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -13,6 +12,7 @@ import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index 0e0aa9706..961249ae9 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -3,14 +3,14 @@ package mekanism.generators.client.gui; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.generators; -import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiTurbineTab; diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java index cedd87feb..d4a10d34e 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java @@ -4,8 +4,6 @@ import java.text.DecimalFormat; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.generators; -import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiElement.IInfoHandler; import mekanism.client.gui.element.GuiEnergyInfo; @@ -15,7 +13,9 @@ import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.LangUtils; +import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerWindGenerator; diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 2dd6c4039..433fbcd10 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -12,11 +12,11 @@ import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; -import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.common.LaserManager; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.util.UnitDisplayUtils.TemperatureUnit; import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.reactor.TileEntityReactorBlock; import mekanism.generators.common.tile.reactor.TileEntityReactorController; diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index b7ba7806f..7c2720e57 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -1,8 +1,8 @@ package mekanism.generators.common; -import mekanism.api.MekanismConfig.generators; import mekanism.common.Mekanism; import mekanism.common.base.IGuiProvider; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityContainerBlock; diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 3accfdba4..48e7f3325 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -4,8 +4,6 @@ import io.netty.buffer.ByteBuf; import java.io.IOException; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.generators; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.infuse.InfuseRegistry; @@ -18,7 +16,9 @@ import mekanism.common.Tier.BaseTier; import mekanism.common.Tier.GasTankTier; import mekanism.common.Version; import mekanism.common.base.IModule; -import mekanism.common.base.TypeConfigManager; +import mekanism.common.config.TypeConfigManager; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketSimpleGui; import mekanism.common.recipe.RecipeHandler; diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index c14f59209..387bb469f 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -2,7 +2,6 @@ package mekanism.generators.common.block; import java.util.Random; -import mekanism.api.MekanismConfig.client; import mekanism.api.energy.IEnergizedItem; import mekanism.client.render.ctm.CTMBlockRenderContext; import mekanism.client.render.ctm.CTMData; @@ -15,6 +14,7 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.block.states.BlockStateBasic; import mekanism.common.block.states.BlockStateFacing; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.multiblock.IMultiblock; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java index 342ef315b..2112b04cf 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -5,12 +5,12 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.generators; import mekanism.common.Mekanism; import mekanism.common.base.IBlockType; import mekanism.common.block.states.BlockStateBasic; import mekanism.common.block.states.BlockStateFacing; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.util.LangUtils; import mekanism.generators.common.GeneratorsBlocks; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 8d54c095b..6ab42fdab 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -6,7 +6,6 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; @@ -14,6 +13,7 @@ import mekanism.common.base.ISustainedData; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ISustainedTank; import mekanism.common.capabilities.ItemCapabilityWrapper; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper; import mekanism.common.integration.ic2.IC2ItemManager; import mekanism.common.integration.tesla.TeslaItemWrapper; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 00c3c4dc0..6f0ba6784 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -4,9 +4,9 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.IEvaporationSolar; -import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.MekanismUtils; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 0068bc37e..a289fce05 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -4,12 +4,12 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.api.MekanismConfig.generators; import mekanism.common.FluidSlot; import mekanism.common.MekanismItems; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 5eb2fb355..00bccad0c 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -16,6 +15,7 @@ import mekanism.common.FuelHandler; import mekanism.common.FuelHandler.FuelGas; import mekanism.common.base.ISustainedData; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.ItemDataUtils; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index d91a64ad2..c87912a11 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -6,13 +6,13 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.api.Range4D; import mekanism.client.sound.ISoundSource; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IHasSound; import mekanism.common.base.IRedstoneControl; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 6458f09e6..11b4ad283 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -6,15 +6,15 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IHeatTransfer; -import mekanism.api.MekanismConfig.generators; -import mekanism.api.util.CapabilityUtils; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.base.ISustainedData; import mekanism.common.capabilities.Capabilities; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.FluidChecker; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index b183d32cb..2a60e490a 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.MekanismConfig.generators; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import micdoodle8.mods.galacticraft.api.world.ISolarLevel; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index 2577d0e3e..a8df3f4d0 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -5,8 +5,8 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.generators; import mekanism.common.base.IBoundingBlock; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index 9ab7de6a3..c546e278b 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -5,7 +5,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.client; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -16,6 +15,7 @@ import mekanism.common.MekanismFluids; import mekanism.common.base.IActiveState; import mekanism.common.base.IHasSound; import mekanism.common.base.SoundWrapper; +import mekanism.common.config.MekanismConfig.client; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.FusionReactor; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index ba9ea9e07..5495c540c 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -15,7 +15,6 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; -import mekanism.api.util.CapabilityUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.base.FluidHandlerWrapper; @@ -23,6 +22,7 @@ import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.util.CableUtils; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 52adcb310..628b2dac0 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -5,12 +5,12 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.MekanismConfig.generators; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; +import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig.generators; import mekanism.common.multiblock.MultiblockCache; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.UpdateProtocol; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index b69663fd7..092a08cc2 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -11,12 +11,12 @@ import ic2.api.energy.tile.IEnergyTile; import java.util.EnumSet; import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IEnergyWrapper; import mekanism.common.base.IFluidHandlerWrapper; import mekanism.common.capabilities.Capabilities; import mekanism.common.capabilities.CapabilityWrapperManager; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.forgeenergy.ForgeEnergyIntegration; import mekanism.common.integration.tesla.TeslaIntegration; import mekanism.common.tile.TileEntityGasTank.GasMode; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java index eaf059052..cb13df9c8 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineVent.java @@ -1,9 +1,9 @@ package mekanism.generators.common.tile.turbine; import mekanism.api.Coord4D; -import mekanism.api.util.CapabilityUtils; import mekanism.common.base.FluidHandlerWrapper; import mekanism.common.base.IFluidHandlerWrapper; +import mekanism.common.util.CapabilityUtils; import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 1c32e2a8b..10931d5d2 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -6,10 +6,10 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.base.IModule; +import mekanism.common.config.MekanismConfig.tools; import mekanism.common.recipe.ShapedMekanismRecipe; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; diff --git a/src/main/java/mekanism/tools/common/ToolsCommonProxy.java b/src/main/java/mekanism/tools/common/ToolsCommonProxy.java index dfdbd39b9..f6df3ceb5 100644 --- a/src/main/java/mekanism/tools/common/ToolsCommonProxy.java +++ b/src/main/java/mekanism/tools/common/ToolsCommonProxy.java @@ -1,7 +1,7 @@ package mekanism.tools.common; -import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; +import mekanism.common.config.MekanismConfig.tools; public class ToolsCommonProxy { diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 6ccae7f20..549429d91 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -2,11 +2,11 @@ package mekanism.tools.item; import java.util.List; -import mekanism.api.util.StackUtils; import mekanism.client.render.ModelCustomArmor; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.util.LangUtils; +import mekanism.common.util.StackUtils; import mekanism.tools.common.MekanismTools; import mekanism.tools.common.ToolsItems; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index 5747670e0..18ff9ce9b 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -2,9 +2,9 @@ package mekanism.tools.item; import java.util.List; -import mekanism.api.util.StackUtils; import mekanism.common.item.ItemMekanism; import mekanism.common.util.LangUtils; +import mekanism.common.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java index 9505fe232..70bf0cb28 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java @@ -2,9 +2,9 @@ package mekanism.tools.item; import java.util.List; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.util.LangUtils; +import mekanism.common.util.StackUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index d71f534e0..d5fff20da 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -3,10 +3,10 @@ package mekanism.tools.item; import java.util.List; import java.util.Set; -import mekanism.api.util.StackUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismItems; import mekanism.common.util.LangUtils; +import mekanism.common.util.StackUtils; import mekanism.tools.common.MekanismTools; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer;