From dff620805a338ff67425e312ef0f136e42afcb5b Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 25 Apr 2023 22:23:41 +0200 Subject: [PATCH] update bs+sa --- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 61608 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- .../api/minecraft/MineTweakerMC.java | 24 ++++++++-------- .../minetweaker/mc1710/FMLEventHandler.java | 15 +++++----- .../minetweaker/mc1710/ForgeEventHandler.java | 19 ++++++------ .../mc1710/MCPlatformFunctions.java | 4 +-- .../minetweaker/mc1710/MineTweakerMod.java | 25 ++++++++-------- .../actions/SetBlockHardnessAction.java | 6 ++-- .../mc1710/actions/SetStackSizeAction.java | 4 +-- .../actions/SetStackmaxDamageAction.java | 4 +-- .../mc1710/actions/SetTranslationAction.java | 4 +-- .../mc1710/block/MCBlockDefinition.java | 4 +-- .../minetweaker/mc1710/block/MCItemBlock.java | 8 +++--- .../mc1710/block/MCSpecificBlock.java | 6 ++-- .../mc1710/block/MCWorldBlock.java | 14 ++++----- .../mc1710/brackets/ItemBracketHandler.java | 7 ++--- .../mc1710/brackets/LiquidBracketHandler.java | 9 +++--- .../mc1710/chat/MCChatMessage.java | 4 +-- .../minetweaker/mc1710/client/MCClient.java | 7 ++--- .../minetweaker/mc1710/data/NBTConverter.java | 26 ++++++++--------- .../minetweaker/mc1710/data/NBTUpdater.java | 6 ++-- .../mc1710/entity/MCEntityDefinition.java | 2 +- .../formatting/FormattedMarkupString.java | 4 +-- .../formatting/FormattedStringJoin.java | 4 +-- .../mc1710/formatting/MCFormatter.java | 4 +-- .../mc1710/furnace/FuelTweaker.java | 7 ++--- .../mc1710/furnace/MCFurnaceManager.java | 9 +++--- .../java/minetweaker/mc1710/game/MCGame.java | 23 +++++++-------- .../mc1710/item/MCItemDefinition.java | 8 +++--- .../minetweaker/mc1710/item/MCItemStack.java | 19 ++++++------ .../mc1710/liquid/MCLiquidDefinition.java | 8 +++--- .../mc1710/liquid/MCLiquidStack.java | 6 ++-- .../minetweaker/mc1710/mods/MCLoadedMods.java | 4 +-- .../java/minetweaker/mc1710/mods/MCMod.java | 2 +- .../MineTweakerCopyClipboardHandler.java | 2 +- .../MineTweakerLoadScriptsHandler.java | 6 ++-- .../MineTweakerOpenBrowserHandler.java | 2 +- .../minetweaker/mc1710/oredict/MCOreDict.java | 4 +-- .../mc1710/oredict/MCOreDictEntry.java | 6 ++-- .../mc1710/player/CommandBlockPlayer.java | 8 +++--- .../minetweaker/mc1710/player/MCPlayer.java | 10 +++---- .../minetweaker/mc1710/player/RconPlayer.java | 8 +++--- .../mc1710/recipes/MCCraftingInventory.java | 12 ++++---- .../mc1710/recipes/MCRecipeManager.java | 27 +++++++++--------- .../mc1710/recipes/RecipeConverter.java | 14 ++++----- .../mc1710/recipes/ShapedRecipeAdvanced.java | 4 +-- .../mc1710/recipes/ShapedRecipeBasic.java | 6 ++-- .../mc1710/recipes/ShapedRecipeOre.java | 4 +-- .../recipes/ShapelessRecipeAdvanced.java | 4 +-- .../mc1710/recipes/ShapelessRecipeBasic.java | 4 +-- .../mc1710/recipes/ShapelessRecipeOre.java | 4 +-- .../minetweaker/mc1710/server/MCServer.java | 20 ++++++------- .../mc1710/server/ServerPlayer.java | 8 +++--- .../mc1710/util/MineTweakerHacks.java | 8 +++--- .../mc1710/vanilla/MCLootRegistry.java | 6 ++-- .../mc1710/vanilla/MCSeedRegistry.java | 6 ++-- .../minetweaker/mc1710/world/MCBiome.java | 4 +-- .../minetweaker/mc1710/world/MCDimension.java | 4 +-- .../mods/ic2/IC2BracketHandler.java | 9 +++--- .../mods/ic2/IC2ExplosionWhitelist.java | 9 +++--- .../minetweaker/mods/ic2/IC2RecipeInput.java | 5 ++-- .../mods/ic2/MachineAddRecipeAction.java | 5 ++-- .../java/minetweaker/mods/ic2/crops/Crop.java | 2 +- .../mods/ic2/crops/CropsConfig.java | 9 +++--- .../mods/ic2/crops/SyntheticCrop.java | 15 +++++----- .../mods/ic2/expand/ItemExpansion.java | 9 +++--- .../mods/ic2/machines/BlastFurnace.java | 4 +-- .../mods/ic2/machines/BlockCutter.java | 4 +-- .../minetweaker/mods/ic2/machines/Canner.java | 9 +++--- .../mods/ic2/machines/Compressor.java | 4 +-- .../mods/ic2/machines/Extractor.java | 4 +-- .../mods/ic2/machines/FluidHeatGenerator.java | 7 ++--- .../mods/ic2/machines/Macerator.java | 4 +-- .../mods/ic2/machines/MatterAmplifier.java | 9 +++--- .../mods/ic2/machines/MetalFormer.java | 4 +-- .../mods/ic2/machines/OreWasher.java | 9 +++--- .../mods/ic2/machines/Recycler.java | 2 +- .../mods/ic2/machines/ScrapBox.java | 2 +- .../mods/ic2/machines/SemiFluidGenerator.java | 7 ++--- .../mods/ic2/machines/ThermalCentrifuge.java | 9 +++--- src/main/java/minetweaker/mods/nei/NEI.java | 7 ++--- 81 files changed, 301 insertions(+), 326 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644 GIT binary patch delta 5094 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 delta 5107 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 I6Xdi10eY*&F8}}l 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.