diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..ccebba7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java b/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java index 6bf0f6e..5e78e54 100644 --- a/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java +++ b/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java @@ -4,6 +4,18 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlock; import minetweaker.api.block.IBlockDefinition; @@ -27,18 +39,6 @@ import minetweaker.mc1710.player.MCPlayer; import minetweaker.mc1710.world.MCBiome; import minetweaker.mc1710.world.MCDimension; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - /** * MineTweaker - MineCraft API bridge. * diff --git a/src/main/java/minetweaker/mc1710/FMLEventHandler.java b/src/main/java/minetweaker/mc1710/FMLEventHandler.java index f90cf5e..2c97a88 100644 --- a/src/main/java/minetweaker/mc1710/FMLEventHandler.java +++ b/src/main/java/minetweaker/mc1710/FMLEventHandler.java @@ -1,5 +1,12 @@ package minetweaker.mc1710; +import net.minecraft.entity.player.EntityPlayerMP; + +import org.lwjgl.input.Keyboard; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.TickEvent; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.event.PlayerCraftedEvent; @@ -12,14 +19,6 @@ import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; import minetweaker.mc1710.recipes.MCCraftingInventory; import minetweaker.mc1710.recipes.MCRecipeManager; -import net.minecraft.entity.player.EntityPlayerMP; - -import org.lwjgl.input.Keyboard; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/ForgeEventHandler.java b/src/main/java/minetweaker/mc1710/ForgeEventHandler.java index 33034fb..1fc4fe1 100644 --- a/src/main/java/minetweaker/mc1710/ForgeEventHandler.java +++ b/src/main/java/minetweaker/mc1710/ForgeEventHandler.java @@ -7,15 +7,6 @@ package minetweaker.mc1710; import java.util.*; -import minetweaker.*; -import minetweaker.api.entity.*; -import minetweaker.api.formatting.IFormattedText; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.tooltip.IngredientTooltips; -import minetweaker.mc1710.formatting.IMCFormattedString; -import minetweaker.mc1710.item.*; - import net.minecraft.client.multiplayer.GuiConnecting; import net.minecraft.entity.*; import net.minecraft.entity.item.*; @@ -26,10 +17,18 @@ import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import stanhebben.zenscript.value.*; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import minetweaker.*; +import minetweaker.api.entity.*; +import minetweaker.api.formatting.IFormattedText; +import minetweaker.api.item.IItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.tooltip.IngredientTooltips; +import minetweaker.mc1710.formatting.IMCFormattedString; +import minetweaker.mc1710.item.*; +import stanhebben.zenscript.value.*; /** * @author Stan diff --git a/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java b/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java index e8c804e..28f5590 100644 --- a/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java +++ b/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java @@ -5,6 +5,8 @@ package minetweaker.mc1710; +import net.minecraft.item.Item; + import minetweaker.IPlatformFunctions; import minetweaker.api.chat.IChatMessage; import minetweaker.api.item.IItemDefinition; @@ -12,8 +14,6 @@ import minetweaker.mc1710.chat.MCChatMessage; import minetweaker.mc1710.item.MCItemDefinition; import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; -import net.minecraft.item.Item; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/src/main/java/minetweaker/mc1710/MineTweakerMod.java index 9445a37..45a90ba 100644 --- a/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -8,6 +8,18 @@ package minetweaker.mc1710; import java.io.File; import java.util.List; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.MinecraftForge; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; @@ -31,19 +43,6 @@ import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; import minetweaker.runtime.providers.ScriptProviderDirectory; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; - /** * Main mod class. Performs some general logic, initialization of the API and FML event handling. * diff --git a/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java b/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java index 2667288..758def5 100644 --- a/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java +++ b/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java @@ -5,12 +5,12 @@ package minetweaker.mc1710.actions; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; + /** * * @author Jared diff --git a/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java b/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java index 0d64b09..9dac047 100644 --- a/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java +++ b/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java @@ -5,10 +5,10 @@ package minetweaker.mc1710.actions; -import minetweaker.IUndoableAction; - import net.minecraft.item.ItemStack; +import minetweaker.IUndoableAction; + /** * * @author Jared diff --git a/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java b/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java index 0f79411..42d7545 100644 --- a/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java +++ b/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java @@ -5,10 +5,10 @@ package minetweaker.mc1710.actions; -import minetweaker.IUndoableAction; - import net.minecraft.item.ItemStack; +import minetweaker.IUndoableAction; + /** * * @author Jared diff --git a/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java b/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java index e414268..4303cd1 100644 --- a/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java +++ b/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java @@ -8,11 +8,11 @@ package minetweaker.mc1710.actions; import java.io.ByteArrayInputStream; import java.nio.charset.Charset; +import net.minecraft.util.StringTranslate; + import minetweaker.IUndoableAction; import minetweaker.mc1710.util.MineTweakerHacks; -import net.minecraft.util.StringTranslate; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java b/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java index 4ea3445..ed47cc8 100644 --- a/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java +++ b/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java @@ -5,10 +5,10 @@ package minetweaker.mc1710.block; -import minetweaker.api.block.IBlockDefinition; - import net.minecraft.block.Block; +import minetweaker.api.block.IBlockDefinition; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/block/MCItemBlock.java b/src/main/java/minetweaker/mc1710/block/MCItemBlock.java index 0b95324..76d0813 100644 --- a/src/main/java/minetweaker/mc1710/block/MCItemBlock.java +++ b/src/main/java/minetweaker/mc1710/block/MCItemBlock.java @@ -8,6 +8,10 @@ package minetweaker.mc1710.block; import java.util.Collections; import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.api.block.BlockPatternOr; import minetweaker.api.block.IBlock; import minetweaker.api.block.IBlockDefinition; @@ -15,10 +19,6 @@ import minetweaker.api.block.IBlockPattern; import minetweaker.api.data.IData; import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java b/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java index 821b5bd..4a2225b 100644 --- a/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java +++ b/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java @@ -8,6 +8,9 @@ package minetweaker.mc1710.block; import java.util.Collections; import java.util.List; +import net.minecraft.block.Block; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.api.block.BlockPatternOr; import minetweaker.api.block.IBlock; import minetweaker.api.block.IBlockDefinition; @@ -15,9 +18,6 @@ import minetweaker.api.block.IBlockPattern; import minetweaker.api.data.IData; import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraft.block.Block; -import net.minecraftforge.oredict.OreDictionary; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java b/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java index 6123a88..b374a2c 100644 --- a/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java +++ b/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java @@ -8,13 +8,6 @@ package minetweaker.mc1710.block; import java.util.Collections; import java.util.List; -import minetweaker.api.block.BlockPatternOr; -import minetweaker.api.block.IBlock; -import minetweaker.api.block.IBlockDefinition; -import minetweaker.api.block.IBlockPattern; -import minetweaker.api.data.IData; -import minetweaker.api.minecraft.MineTweakerMC; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,6 +16,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraftforge.oredict.OreDictionary; +import minetweaker.api.block.BlockPatternOr; +import minetweaker.api.block.IBlock; +import minetweaker.api.block.IBlockDefinition; +import minetweaker.api.block.IBlockPattern; +import minetweaker.api.data.IData; +import minetweaker.api.minecraft.MineTweakerMC; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java b/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java index b270382..fb6c968 100644 --- a/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java +++ b/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java @@ -12,15 +12,14 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.item.Item; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IngredientAny; - -import net.minecraft.item.Item; -import net.minecraftforge.oredict.OreDictionary; - import stanhebben.zenscript.ZenTokener; import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.expression.ExpressionCallStatic; diff --git a/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java b/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java index e4959e7..dff4068 100644 --- a/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java +++ b/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java @@ -4,16 +4,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import minetweaker.IBracketHandler; import minetweaker.annotations.BracketHandler; import minetweaker.api.liquid.ILiquidStack; import minetweaker.mc1710.liquid.MCLiquidStack; import minetweaker.runtime.GlobalRegistry; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.expression.ExpressionCallStatic; import stanhebben.zenscript.expression.ExpressionString; diff --git a/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java b/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java index c3d413d..8cbbf8b 100644 --- a/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java +++ b/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java @@ -5,11 +5,11 @@ package minetweaker.mc1710.chat; -import minetweaker.api.chat.IChatMessage; - import net.minecraft.util.ChatComponentText; import net.minecraft.util.IChatComponent; +import minetweaker.api.chat.IChatMessage; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/client/MCClient.java b/src/main/java/minetweaker/mc1710/client/MCClient.java index 1cd4166..59cbe46 100644 --- a/src/main/java/minetweaker/mc1710/client/MCClient.java +++ b/src/main/java/minetweaker/mc1710/client/MCClient.java @@ -5,13 +5,12 @@ package minetweaker.mc1710.client; -import minetweaker.api.client.IClient; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; - import net.minecraft.client.Minecraft; import cpw.mods.fml.client.FMLClientHandler; +import minetweaker.api.client.IClient; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.player.IPlayer; /** * diff --git a/src/main/java/minetweaker/mc1710/data/NBTConverter.java b/src/main/java/minetweaker/mc1710/data/NBTConverter.java index 5764fe0..cae960e 100644 --- a/src/main/java/minetweaker/mc1710/data/NBTConverter.java +++ b/src/main/java/minetweaker/mc1710/data/NBTConverter.java @@ -11,6 +11,19 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagByteArray; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.nbt.NBTTagString; + import minetweaker.api.data.DataByte; import minetweaker.api.data.DataByteArray; import minetweaker.api.data.DataDouble; @@ -26,19 +39,6 @@ import minetweaker.api.data.IData; import minetweaker.api.data.IDataConverter; import minetweaker.mc1710.util.MineTweakerHacks; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagByte; -import net.minecraft.nbt.NBTTagByteArray; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagDouble; -import net.minecraft.nbt.NBTTagFloat; -import net.minecraft.nbt.NBTTagInt; -import net.minecraft.nbt.NBTTagIntArray; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagLong; -import net.minecraft.nbt.NBTTagShort; -import net.minecraft.nbt.NBTTagString; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/data/NBTUpdater.java b/src/main/java/minetweaker/mc1710/data/NBTUpdater.java index b23b3cb..c8793b9 100644 --- a/src/main/java/minetweaker/mc1710/data/NBTUpdater.java +++ b/src/main/java/minetweaker/mc1710/data/NBTUpdater.java @@ -7,12 +7,12 @@ package minetweaker.mc1710.data; import java.util.Map; -import minetweaker.api.data.IData; -import minetweaker.api.data.IDataConverter; - import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; +import minetweaker.api.data.IData; +import minetweaker.api.data.IDataConverter; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java b/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java index 49d7a46..e97d340 100644 --- a/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java +++ b/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java @@ -7,10 +7,10 @@ package minetweaker.mc1710.entity; import java.util.*; +import cpw.mods.fml.common.registry.EntityRegistry; import minetweaker.api.entity.IEntityDefinition; import minetweaker.api.item.*; import stanhebben.zenscript.value.*; -import cpw.mods.fml.common.registry.EntityRegistry; /** * diff --git a/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java b/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java index e1dfa84..e7f0e92 100644 --- a/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java +++ b/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java @@ -5,10 +5,10 @@ package minetweaker.mc1710.formatting; -import minetweaker.api.formatting.IFormattedText; - import net.minecraft.util.EnumChatFormatting; +import minetweaker.api.formatting.IFormattedText; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java b/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java index a96ee63..3f8aafa 100644 --- a/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java +++ b/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java @@ -7,10 +7,10 @@ package minetweaker.mc1710.formatting; import java.util.Arrays; -import minetweaker.api.formatting.IFormattedText; - import net.minecraft.util.EnumChatFormatting; +import minetweaker.api.formatting.IFormattedText; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java b/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java index 0551dec..46be680 100644 --- a/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java +++ b/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java @@ -5,11 +5,11 @@ package minetweaker.mc1710.formatting; +import net.minecraft.util.EnumChatFormatting; + import minetweaker.api.formatting.IFormattedText; import minetweaker.api.formatting.IFormatter; -import net.minecraft.util.EnumChatFormatting; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java b/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java index 9b78a2b..95f3582 100644 --- a/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java +++ b/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java @@ -10,15 +10,14 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.GameRegistry; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; +import minetweaker.api.minecraft.MineTweakerMC; public class FuelTweaker { diff --git a/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java b/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java index ec161ed..8283694 100644 --- a/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java +++ b/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java @@ -13,6 +13,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; + +import cpw.mods.fml.common.registry.GameRegistry; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -22,11 +26,6 @@ import minetweaker.api.recipes.IFurnaceManager; import minetweaker.api.recipes.IFurnaceRecipe; import minetweaker.mc1710.item.MCItemStack; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; - -import cpw.mods.fml.common.registry.GameRegistry; - /** * @author Stan */ diff --git a/src/main/java/minetweaker/mc1710/game/MCGame.java b/src/main/java/minetweaker/mc1710/game/MCGame.java index 9cf79d7..d9bb68b 100644 --- a/src/main/java/minetweaker/mc1710/game/MCGame.java +++ b/src/main/java/minetweaker/mc1710/game/MCGame.java @@ -10,6 +10,17 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.item.Item; +import net.minecraft.util.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; + +import com.google.common.collect.*; + +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlockDefinition; @@ -26,18 +37,6 @@ import minetweaker.mc1710.liquid.MCLiquidDefinition; import minetweaker.mc1710.util.MineTweakerHacks; import minetweaker.mc1710.util.MineTweakerPlatformUtils; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.item.Item; -import net.minecraft.util.*; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; - -import com.google.common.collect.*; - -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java b/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java index 10beeba..3214858 100644 --- a/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java +++ b/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java @@ -8,16 +8,16 @@ package minetweaker.mc1710.item; import java.util.ArrayList; import java.util.List; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemDefinition; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.oredict.IOreDictEntry; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/item/MCItemStack.java b/src/main/java/minetweaker/mc1710/item/MCItemStack.java index e8b3296..5f00062 100644 --- a/src/main/java/minetweaker/mc1710/item/MCItemStack.java +++ b/src/main/java/minetweaker/mc1710/item/MCItemStack.java @@ -12,6 +12,15 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +import cpw.mods.fml.relauncher.ReflectionHelper; import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlock; import minetweaker.api.data.DataMap; @@ -29,16 +38,6 @@ import minetweaker.mc1710.data.NBTConverter; import minetweaker.mc1710.liquid.MCLiquidStack; import minetweaker.util.ArrayUtil; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -import cpw.mods.fml.relauncher.ReflectionHelper; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java b/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java index b7df8f5..eaad84b 100644 --- a/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java +++ b/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java @@ -8,6 +8,10 @@ package minetweaker.mc1710.liquid; import java.util.ArrayList; import java.util.List; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -15,10 +19,6 @@ import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.minecraft.MineTweakerMC; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java b/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java index 194cebf..bdafe7d 100644 --- a/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java +++ b/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java @@ -8,6 +8,9 @@ package minetweaker.mc1710.liquid; import java.util.Collections; import java.util.List; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.FluidStack; + import minetweaker.api.data.IData; import minetweaker.api.item.*; import minetweaker.api.liquid.ILiquidDefinition; @@ -15,9 +18,6 @@ import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.player.IPlayer; import minetweaker.mc1710.data.NBTConverter; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; - /** * @author Stan */ diff --git a/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java b/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java index 08d47a6..0b9825a 100644 --- a/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java +++ b/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java @@ -3,11 +3,11 @@ package minetweaker.mc1710.mods; import java.util.Iterator; import java.util.List; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; import minetweaker.api.mods.ILoadedMods; import minetweaker.api.mods.IMod; import stanhebben.zenscript.util.MappingIterator; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; /** * diff --git a/src/main/java/minetweaker/mc1710/mods/MCMod.java b/src/main/java/minetweaker/mc1710/mods/MCMod.java index da463bd..11b115c 100644 --- a/src/main/java/minetweaker/mc1710/mods/MCMod.java +++ b/src/main/java/minetweaker/mc1710/mods/MCMod.java @@ -5,8 +5,8 @@ package minetweaker.mc1710.mods; -import minetweaker.api.mods.IMod; import cpw.mods.fml.common.ModContainer; +import minetweaker.api.mods.IMod; /** * diff --git a/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java b/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java index d9cedf5..56dd771 100644 --- a/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java +++ b/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java @@ -10,10 +10,10 @@ import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; -import minetweaker.mc1710.MineTweakerConfig; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import minetweaker.mc1710.MineTweakerConfig; /** * diff --git a/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java b/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java index 3c89fce..5a4b0db 100644 --- a/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java +++ b/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java @@ -5,13 +5,13 @@ package minetweaker.mc1710.network; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.mc1710.MineTweakerConfig; import minetweaker.runtime.providers.ScriptProviderMemory; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; /** * diff --git a/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java b/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java index 7b32fc3..e703e29 100644 --- a/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java +++ b/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java @@ -10,10 +10,10 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import minetweaker.mc1710.MineTweakerConfig; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import minetweaker.mc1710.MineTweakerConfig; /** * diff --git a/src/main/java/minetweaker/mc1710/oredict/MCOreDict.java b/src/main/java/minetweaker/mc1710/oredict/MCOreDict.java index edd9aa9..59a1a84 100644 --- a/src/main/java/minetweaker/mc1710/oredict/MCOreDict.java +++ b/src/main/java/minetweaker/mc1710/oredict/MCOreDict.java @@ -10,12 +10,12 @@ import static minetweaker.api.minecraft.MineTweakerMC.getOreDict; import java.util.ArrayList; import java.util.List; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.oredict.IOreDict; import minetweaker.api.oredict.IOreDictEntry; -import net.minecraftforge.oredict.OreDictionary; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java b/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java index 8036d5c..86dd278 100644 --- a/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java +++ b/src/main/java/minetweaker/mc1710/oredict/MCOreDictEntry.java @@ -12,6 +12,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.*; @@ -22,9 +25,6 @@ import minetweaker.api.player.IPlayer; import minetweaker.mc1710.util.MineTweakerHacks; import minetweaker.util.ArrayUtil; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - /** * @author Stan */ diff --git a/src/main/java/minetweaker/mc1710/player/CommandBlockPlayer.java b/src/main/java/minetweaker/mc1710/player/CommandBlockPlayer.java index cb7698a..1eb83f2 100644 --- a/src/main/java/minetweaker/mc1710/player/CommandBlockPlayer.java +++ b/src/main/java/minetweaker/mc1710/player/CommandBlockPlayer.java @@ -1,15 +1,15 @@ package minetweaker.mc1710.player; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; + import minetweaker.MineTweakerAPI; import minetweaker.api.chat.IChatMessage; import minetweaker.api.data.IData; import minetweaker.api.item.IItemStack; import minetweaker.api.player.IPlayer; -import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; - /** * @author Jared */ diff --git a/src/main/java/minetweaker/mc1710/player/MCPlayer.java b/src/main/java/minetweaker/mc1710/player/MCPlayer.java index d5f6156..4ef02ff 100644 --- a/src/main/java/minetweaker/mc1710/player/MCPlayer.java +++ b/src/main/java/minetweaker/mc1710/player/MCPlayer.java @@ -5,6 +5,11 @@ package minetweaker.mc1710.player; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; + import minetweaker.MineTweakerAPI; import minetweaker.api.chat.IChatMessage; import minetweaker.api.data.IData; @@ -17,11 +22,6 @@ import minetweaker.mc1710.data.NBTConverter; import minetweaker.mc1710.network.MineTweakerCopyClipboardPacket; import minetweaker.mc1710.network.MineTweakerOpenBrowserPacket; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/player/RconPlayer.java b/src/main/java/minetweaker/mc1710/player/RconPlayer.java index 663e181..96f0b5c 100644 --- a/src/main/java/minetweaker/mc1710/player/RconPlayer.java +++ b/src/main/java/minetweaker/mc1710/player/RconPlayer.java @@ -1,15 +1,15 @@ package minetweaker.mc1710.player; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; + import minetweaker.MineTweakerAPI; import minetweaker.api.chat.IChatMessage; import minetweaker.api.data.IData; import minetweaker.api.item.IItemStack; import minetweaker.api.player.IPlayer; -import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; - /** * * @author Jared diff --git a/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java b/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java index 77b2692..de20452 100644 --- a/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java +++ b/src/main/java/minetweaker/mc1710/recipes/MCCraftingInventory.java @@ -11,12 +11,6 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import java.util.List; -import minetweaker.api.item.IItemStack; -import minetweaker.api.player.IPlayer; -import minetweaker.api.recipes.ICraftingInventory; -import minetweaker.mc1710.player.MCPlayer; -import minetweaker.mc1710.util.MineTweakerHacks; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -25,6 +19,12 @@ import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; +import minetweaker.api.item.IItemStack; +import minetweaker.api.player.IPlayer; +import minetweaker.api.recipes.ICraftingInventory; +import minetweaker.mc1710.player.MCPlayer; +import minetweaker.mc1710.util.MineTweakerHacks; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java b/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java index 155efcf..d362cfb 100644 --- a/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java +++ b/src/main/java/minetweaker/mc1710/recipes/MCRecipeManager.java @@ -9,6 +9,19 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.RecursiveAction; import java.util.stream.Collectors; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +import org.apache.commons.lang3.tuple.Pair; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -27,20 +40,6 @@ import minetweaker.mc1710.item.MCItemStack; import minetweaker.mc1710.util.MineTweakerHacks; import minetweaker.mc1710.util.ThreadSafeBitSet; import minetweaker.util.IEventHandler; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - -import org.apache.commons.lang3.tuple.Pair; - import stanhebben.zenscript.annotations.Optional; /** diff --git a/src/main/java/minetweaker/mc1710/recipes/RecipeConverter.java b/src/main/java/minetweaker/mc1710/recipes/RecipeConverter.java index 016da36..1af3c1e 100644 --- a/src/main/java/minetweaker/mc1710/recipes/RecipeConverter.java +++ b/src/main/java/minetweaker/mc1710/recipes/RecipeConverter.java @@ -10,6 +10,13 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import java.util.ArrayList; import java.util.Arrays; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; @@ -18,13 +25,6 @@ import minetweaker.api.recipes.ShapedRecipe; import minetweaker.api.recipes.ShapelessRecipe; import minetweaker.api.recipes.UnknownRecipe; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeAdvanced.java b/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeAdvanced.java index 05a4f60..1e7ae43 100644 --- a/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeAdvanced.java +++ b/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeAdvanced.java @@ -7,13 +7,13 @@ package minetweaker.mc1710.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.recipes.ShapedRecipe; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import minetweaker.api.recipes.ShapedRecipe; + /** * TODO: NEI integration for this kind of recipes. * diff --git a/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeBasic.java b/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeBasic.java index 1541c38..5800955 100644 --- a/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeBasic.java +++ b/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeBasic.java @@ -7,14 +7,14 @@ package minetweaker.mc1710.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.item.IItemStack; -import minetweaker.api.recipes.ShapedRecipe; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.world.World; +import minetweaker.api.item.IItemStack; +import minetweaker.api.recipes.ShapedRecipe; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeOre.java b/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeOre.java index 1992bca..f9dfc52 100644 --- a/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeOre.java +++ b/src/main/java/minetweaker/mc1710/recipes/ShapedRecipeOre.java @@ -7,13 +7,13 @@ package minetweaker.mc1710.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.recipes.ShapedRecipe; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.ShapedOreRecipe; +import minetweaker.api.recipes.ShapedRecipe; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeAdvanced.java b/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeAdvanced.java index c0fa2aa..7e75892 100644 --- a/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeAdvanced.java +++ b/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeAdvanced.java @@ -7,13 +7,13 @@ package minetweaker.mc1710.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.recipes.ShapelessRecipe; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import minetweaker.api.recipes.ShapelessRecipe; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeBasic.java b/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeBasic.java index cf89ad3..c264474 100644 --- a/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeBasic.java +++ b/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeBasic.java @@ -9,13 +9,13 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import java.util.Arrays; -import minetweaker.api.recipes.ShapelessRecipe; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.world.World; +import minetweaker.api.recipes.ShapelessRecipe; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeOre.java b/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeOre.java index b7c1657..eb51898 100644 --- a/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeOre.java +++ b/src/main/java/minetweaker/mc1710/recipes/ShapelessRecipeOre.java @@ -7,13 +7,13 @@ package minetweaker.mc1710.recipes; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.api.recipes.ShapelessRecipe; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.ShapelessOreRecipe; +import minetweaker.api.recipes.ShapelessRecipe; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/server/MCServer.java b/src/main/java/minetweaker/mc1710/server/MCServer.java index 87b69ca..027d4cd 100644 --- a/src/main/java/minetweaker/mc1710/server/MCServer.java +++ b/src/main/java/minetweaker/mc1710/server/MCServer.java @@ -8,6 +8,16 @@ package minetweaker.mc1710.server; import java.util.Arrays; import java.util.List; +import net.minecraft.command.CommandHandler; +import net.minecraft.command.ICommand; +import net.minecraft.command.ICommandSender; +import net.minecraft.command.server.CommandBlockLogic; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.rcon.RConConsoleSource; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.dedicated.DedicatedServer; +import net.minecraft.server.management.UserListOps; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.minecraft.MineTweakerMC; @@ -19,16 +29,6 @@ import minetweaker.api.server.ICommandValidator; import minetweaker.mc1710.player.CommandBlockPlayer; import minetweaker.mc1710.player.RconPlayer; -import net.minecraft.command.CommandHandler; -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.command.server.CommandBlockLogic; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.network.rcon.RConConsoleSource; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.server.management.UserListOps; - /** * @author Stan */ diff --git a/src/main/java/minetweaker/mc1710/server/ServerPlayer.java b/src/main/java/minetweaker/mc1710/server/ServerPlayer.java index bf9a4fb..5116b34 100644 --- a/src/main/java/minetweaker/mc1710/server/ServerPlayer.java +++ b/src/main/java/minetweaker/mc1710/server/ServerPlayer.java @@ -14,15 +14,15 @@ import java.net.URI; import java.util.logging.Level; import java.util.logging.Logger; +import net.minecraft.server.dedicated.DedicatedServer; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; + import minetweaker.api.chat.IChatMessage; import minetweaker.api.data.IData; import minetweaker.api.item.IItemStack; import minetweaker.api.player.IPlayer; -import net.minecraft.server.dedicated.DedicatedServer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java b/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java index b1fae80..82d161c 100644 --- a/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java +++ b/src/main/java/minetweaker/mc1710/util/MineTweakerHacks.java @@ -15,10 +15,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.WeightedItemStack; -import minetweaker.api.minecraft.MineTweakerMC; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -37,7 +33,11 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import com.google.common.collect.BiMap; + import cpw.mods.fml.common.registry.EntityRegistry; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.minecraft.MineTweakerMC; /** * Common class for all runtime hacks (stuff requiring reflection). It is not unexpected to have it break with new diff --git a/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java b/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java index 998ac0d..7b25e34 100644 --- a/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java +++ b/src/main/java/minetweaker/mc1710/vanilla/MCLootRegistry.java @@ -10,6 +10,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -19,9 +22,6 @@ import minetweaker.api.vanilla.ILootRegistry; import minetweaker.api.vanilla.LootEntry; import minetweaker.mc1710.util.MineTweakerHacks; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java b/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java index 42dc9dd..94fe6e9 100644 --- a/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java +++ b/src/main/java/minetweaker/mc1710/vanilla/MCSeedRegistry.java @@ -8,6 +8,9 @@ package minetweaker.mc1710.vanilla; import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandom; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -17,9 +20,6 @@ import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.vanilla.ISeedRegistry; import minetweaker.mc1710.util.MineTweakerHacks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/world/MCBiome.java b/src/main/java/minetweaker/mc1710/world/MCBiome.java index 1b7c744..539953b 100644 --- a/src/main/java/minetweaker/mc1710/world/MCBiome.java +++ b/src/main/java/minetweaker/mc1710/world/MCBiome.java @@ -5,10 +5,10 @@ package minetweaker.mc1710.world; -import minetweaker.api.world.IBiome; - import net.minecraft.world.biome.BiomeGenBase; +import minetweaker.api.world.IBiome; + /** * * @author Stan diff --git a/src/main/java/minetweaker/mc1710/world/MCDimension.java b/src/main/java/minetweaker/mc1710/world/MCDimension.java index f5f7157..8ebf1b8 100644 --- a/src/main/java/minetweaker/mc1710/world/MCDimension.java +++ b/src/main/java/minetweaker/mc1710/world/MCDimension.java @@ -5,12 +5,12 @@ package minetweaker.mc1710.world; +import net.minecraft.world.World; + import minetweaker.api.block.IBlock; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.world.IDimension; -import net.minecraft.world.World; - /** * * @author Stan diff --git a/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java b/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java index 1f3e3a3..5af12e7 100644 --- a/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java +++ b/src/main/java/minetweaker/mods/ic2/IC2BracketHandler.java @@ -4,15 +4,15 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import ic2.api.item.IC2Items; import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import stanhebben.zenscript.ZenTokener; import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.expression.ExpressionCallStatic; @@ -24,7 +24,6 @@ import stanhebben.zenscript.symbols.IZenSymbol; import stanhebben.zenscript.type.ZenType; import stanhebben.zenscript.type.natives.IJavaMethod; import stanhebben.zenscript.util.ZenPosition; -import ic2.api.item.IC2Items; /** * Makes a ic2-item specific item syntax available in the form <item-ic2:name[:meta]>. diff --git a/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java b/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java index 03d3a57..7721d43 100644 --- a/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java +++ b/src/main/java/minetweaker/mods/ic2/IC2ExplosionWhitelist.java @@ -2,17 +2,16 @@ package minetweaker.mods.ic2; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import ic2.api.tile.ExplosionWhitelist; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.tile.ExplosionWhitelist; /** * Manages the explosion whitelist in IC2. Blocks on this whitelist will not resist an explosion but won't be destroyed. diff --git a/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java b/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java index bea8d3f..cc63fb3 100644 --- a/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java +++ b/src/main/java/minetweaker/mods/ic2/IC2RecipeInput.java @@ -11,12 +11,11 @@ import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import java.util.ArrayList; import java.util.List; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; - import net.minecraft.item.ItemStack; import ic2.api.recipe.IRecipeInput; +import minetweaker.api.item.IIngredient; +import minetweaker.api.item.IItemStack; /** * Wrapper class for ITweakerItemStackPatterns to IC2 recipe inputs. diff --git a/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java b/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java index 3b5b221..149c6f3 100644 --- a/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java +++ b/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java @@ -2,14 +2,13 @@ package minetweaker.mods.ic2; import java.util.Arrays; -import minetweaker.MineTweakerAPI; -import minetweaker.OneWayAction; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import ic2.api.recipe.IMachineRecipeManager; import ic2.api.recipe.IMachineRecipeManagerExt; +import minetweaker.MineTweakerAPI; +import minetweaker.OneWayAction; /** * diff --git a/src/main/java/minetweaker/mods/ic2/crops/Crop.java b/src/main/java/minetweaker/mods/ic2/crops/Crop.java index 135e409..ff260e4 100644 --- a/src/main/java/minetweaker/mods/ic2/crops/Crop.java +++ b/src/main/java/minetweaker/mods/ic2/crops/Crop.java @@ -1,10 +1,10 @@ package minetweaker.mods.ic2.crops; +import ic2.api.crops.CropCard; import stanhebben.zenscript.annotations.ZenCaster; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.crops.CropCard; /** * Read-only data accessor for crops diff --git a/src/main/java/minetweaker/mods/ic2/crops/CropsConfig.java b/src/main/java/minetweaker/mods/ic2/crops/CropsConfig.java index ed227f1..5886582 100644 --- a/src/main/java/minetweaker/mods/ic2/crops/CropsConfig.java +++ b/src/main/java/minetweaker/mods/ic2/crops/CropsConfig.java @@ -4,19 +4,18 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import net.minecraftforge.common.BiomeDictionary; + +import ic2.api.crops.CropCard; +import ic2.api.crops.Crops; import minetweaker.MineTweakerAPI; import minetweaker.OneWayAction; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraftforge.common.BiomeDictionary; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.crops.CropCard; -import ic2.api.crops.Crops; @ZenClass("mods.ic2.CropsConfig") @ModOnly("IC2") diff --git a/src/main/java/minetweaker/mods/ic2/crops/SyntheticCrop.java b/src/main/java/minetweaker/mods/ic2/crops/SyntheticCrop.java index 798e0bc..33a0b8d 100644 --- a/src/main/java/minetweaker/mods/ic2/crops/SyntheticCrop.java +++ b/src/main/java/minetweaker/mods/ic2/crops/SyntheticCrop.java @@ -1,21 +1,20 @@ package minetweaker.mods.ic2.crops; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenGetter; -import stanhebben.zenscript.annotations.ZenMethod; -import stanhebben.zenscript.annotations.ZenSetter; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.api.crops.CropCard; import ic2.api.crops.ICropTile; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenGetter; +import stanhebben.zenscript.annotations.ZenMethod; +import stanhebben.zenscript.annotations.ZenSetter; /** * A synthetic crop, created in ZS diff --git a/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java b/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java index 849ccde..58a80d1 100644 --- a/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java +++ b/src/main/java/minetweaker/mods/ic2/expand/ItemExpansion.java @@ -3,18 +3,17 @@ package minetweaker.mods.ic2.expand; import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; -import minetweaker.annotations.ModOnly; -import minetweaker.api.item.IItemStack; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; +import minetweaker.annotations.ModOnly; +import minetweaker.api.item.IItemStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenExpansion; import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; /** * diff --git a/src/main/java/minetweaker/mods/ic2/machines/BlastFurnace.java b/src/main/java/minetweaker/mods/ic2/machines/BlastFurnace.java index 180c8e6..0572f67 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/BlastFurnace.java +++ b/src/main/java/minetweaker/mods/ic2/machines/BlastFurnace.java @@ -9,6 +9,8 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; @@ -18,8 +20,6 @@ import minetweaker.mods.ic2.MachineAddRecipeAction; import stanhebben.zenscript.annotations.NotNull; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * Provides access to the IC2 Blast Furnace recipes. diff --git a/src/main/java/minetweaker/mods/ic2/machines/BlockCutter.java b/src/main/java/minetweaker/mods/ic2/machines/BlockCutter.java index 66a9a76..0cc4104 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/BlockCutter.java +++ b/src/main/java/minetweaker/mods/ic2/machines/BlockCutter.java @@ -9,6 +9,8 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; @@ -18,8 +20,6 @@ import minetweaker.mods.ic2.MachineAddRecipeAction; import stanhebben.zenscript.annotations.NotNull; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * Provides access to the IC2 Block Cutter recipes. diff --git a/src/main/java/minetweaker/mods/ic2/machines/Canner.java b/src/main/java/minetweaker/mods/ic2/machines/Canner.java index 7439cec..9495bd2 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/Canner.java +++ b/src/main/java/minetweaker/mods/ic2/machines/Canner.java @@ -7,6 +7,10 @@ package minetweaker.mods.ic2.machines; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import net.minecraftforge.fluids.FluidStack; + +import ic2.api.recipe.RecipeInputFluidContainer; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.OneWayAction; import minetweaker.annotations.ModOnly; @@ -14,13 +18,8 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; import minetweaker.mods.ic2.IC2RecipeInput; - -import net.minecraftforge.fluids.FluidStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeInputFluidContainer; -import ic2.api.recipe.Recipes; /** * diff --git a/src/main/java/minetweaker/mods/ic2/machines/Compressor.java b/src/main/java/minetweaker/mods/ic2/machines/Compressor.java index 4cfe7df..52a5653 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/Compressor.java +++ b/src/main/java/minetweaker/mods/ic2/machines/Compressor.java @@ -4,6 +4,8 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; @@ -13,8 +15,6 @@ import minetweaker.mods.ic2.MachineAddRecipeAction; import stanhebben.zenscript.annotations.NotNull; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * Provides access to the IC2 compressor recipes. Recipes can be added but not removed, due to IC2 API restrictions. diff --git a/src/main/java/minetweaker/mods/ic2/machines/Extractor.java b/src/main/java/minetweaker/mods/ic2/machines/Extractor.java index 872ac64..453f398 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/Extractor.java +++ b/src/main/java/minetweaker/mods/ic2/machines/Extractor.java @@ -9,6 +9,8 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; @@ -18,8 +20,6 @@ import minetweaker.mods.ic2.MachineAddRecipeAction; import stanhebben.zenscript.annotations.NotNull; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * Provides access to the IC2 Extractor recipes. diff --git a/src/main/java/minetweaker/mods/ic2/machines/FluidHeatGenerator.java b/src/main/java/minetweaker/mods/ic2/machines/FluidHeatGenerator.java index e90a68b..994ece1 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/FluidHeatGenerator.java +++ b/src/main/java/minetweaker/mods/ic2/machines/FluidHeatGenerator.java @@ -5,16 +5,15 @@ package minetweaker.mods.ic2.machines; +import net.minecraftforge.fluids.FluidRegistry; + +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.OneWayAction; import minetweaker.annotations.ModOnly; import minetweaker.api.liquid.ILiquidStack; - -import net.minecraftforge.fluids.FluidRegistry; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.Recipes; /** * Add a fluid to the fluid heat generator diff --git a/src/main/java/minetweaker/mods/ic2/machines/Macerator.java b/src/main/java/minetweaker/mods/ic2/machines/Macerator.java index 99f4318..b3e52f8 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/Macerator.java +++ b/src/main/java/minetweaker/mods/ic2/machines/Macerator.java @@ -4,6 +4,8 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; @@ -13,8 +15,6 @@ import minetweaker.mods.ic2.MachineAddRecipeAction; import stanhebben.zenscript.annotations.NotNull; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * Provides access to the IC2 macerator recipes. Recipes can be added but not removed, due to IC2 API restrictions. diff --git a/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java b/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java index 24a4e1d..cd4278f 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java +++ b/src/main/java/minetweaker/mods/ic2/machines/MatterAmplifier.java @@ -5,18 +5,17 @@ package minetweaker.mods.ic2.machines; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.mods.ic2.IC2RecipeInput; import minetweaker.mods.ic2.MachineAddRecipeAction; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.Recipes; /** * diff --git a/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java b/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java index a0b41dc..dfcc858 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java +++ b/src/main/java/minetweaker/mods/ic2/machines/MetalFormer.java @@ -9,6 +9,8 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; @@ -17,8 +19,6 @@ import minetweaker.mods.ic2.IC2RecipeInput; import minetweaker.mods.ic2.MachineAddRecipeAction; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * diff --git a/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java b/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java index b9a2c43..5c05746 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java +++ b/src/main/java/minetweaker/mods/ic2/machines/OreWasher.java @@ -4,19 +4,18 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStacks; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import net.minecraft.nbt.NBTTagCompound; + +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.mods.ic2.IC2RecipeInput; import minetweaker.mods.ic2.MachineAddRecipeAction; - -import net.minecraft.nbt.NBTTagCompound; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * diff --git a/src/main/java/minetweaker/mods/ic2/machines/Recycler.java b/src/main/java/minetweaker/mods/ic2/machines/Recycler.java index 826906b..b825795 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/Recycler.java +++ b/src/main/java/minetweaker/mods/ic2/machines/Recycler.java @@ -7,6 +7,7 @@ package minetweaker.mods.ic2.machines; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.OneWayAction; import minetweaker.annotations.ModOnly; @@ -15,7 +16,6 @@ import minetweaker.api.item.IItemStack; import minetweaker.mods.ic2.IC2RecipeInput; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.Recipes; /** * diff --git a/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java b/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java index 1f72b55..2c6b4df 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java +++ b/src/main/java/minetweaker/mods/ic2/machines/ScrapBox.java @@ -7,13 +7,13 @@ package minetweaker.mods.ic2.machines; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.OneWayAction; import minetweaker.annotations.ModOnly; import minetweaker.api.item.WeightedItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.Recipes; /** * diff --git a/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java b/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java index 388a381..77edd27 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java +++ b/src/main/java/minetweaker/mods/ic2/machines/SemiFluidGenerator.java @@ -5,16 +5,15 @@ package minetweaker.mods.ic2.machines; +import net.minecraftforge.fluids.FluidRegistry; + +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.OneWayAction; import minetweaker.annotations.ModOnly; import minetweaker.api.liquid.ILiquidStack; - -import net.minecraftforge.fluids.FluidRegistry; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.Recipes; /** * Add a fluid to the semi-fluid generator diff --git a/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java b/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java index f094c06..2a747d9 100644 --- a/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java +++ b/src/main/java/minetweaker/mods/ic2/machines/ThermalCentrifuge.java @@ -4,19 +4,18 @@ import static minetweaker.api.minecraft.MineTweakerMC.getIItemStacks; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; import static minetweaker.api.minecraft.MineTweakerMC.getItemStacks; +import net.minecraft.nbt.NBTTagCompound; + +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.mods.ic2.IC2RecipeInput; import minetweaker.mods.ic2.MachineAddRecipeAction; - -import net.minecraft.nbt.NBTTagCompound; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; /** * Provides access to the IC2 compressor recipes. Recipes can be added but not removed, due to IC2 API restrictions. diff --git a/src/main/java/minetweaker/mods/nei/NEI.java b/src/main/java/minetweaker/mods/nei/NEI.java index a9e7da1..6d5d182 100644 --- a/src/main/java/minetweaker/mods/nei/NEI.java +++ b/src/main/java/minetweaker/mods/nei/NEI.java @@ -2,18 +2,17 @@ package minetweaker.mods.nei; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; +import net.minecraft.item.ItemStack; + +import codechicken.nei.api.API; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.OneWayAction; import minetweaker.annotations.ModOnly; import minetweaker.api.item.IItemStack; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.NotNull; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import codechicken.nei.api.API; /** * MineTweaker NEI support.