diff --git a/build.gradle b/build.gradle index 952a3c5..3eb19a2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1704650211 +//version: 1704751096 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -786,7 +786,7 @@ dependencies { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} diff --git a/dependencies.gradle b/dependencies.gradle index 44d83bc..912e9fe 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,14 +1,14 @@ dependencies { - api("com.github.GTNewHorizons:CraftTweaker:3.2.11:dev") + api("com.github.GTNewHorizons:CraftTweaker:3.3.0:dev") compileOnly("com.azanor:Thaumcraft:1.7.10-4.2.3.5:deobf") { transitive = false } - compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-72-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.9.1-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Chisel:2.10.7-GTNH:api") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.5:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Mantle:0.3.4:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Railcraft:9.13.5:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.9.0.10-GTNH:api") { transitive = false } + compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-307-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Chisel:2.13.2-GTNH:api") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.8.1:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Mantle:1.7.10-0.4.0:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Railcraft:9.15.3:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.11.4-GTNH:api") { transitive = false } compileOnly("curse.maven:botanical-addons-237152:2281663") { transitive = false } compileOnly("curse.maven:extra-utilities-225561:2264384") { transitive = false } compileOnly("curse.maven:thermal-expansion-69163:2388759") { transitive = false } diff --git a/repositories.gradle b/repositories.gradle index 3dc2b09..a7cf4fe 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,12 +1,4 @@ repositories { - maven { - name "GTNH Maven" - url "http://jenkins.usrv.eu:8081/nexus/content/repositories/public/" - } - maven { - name "Thaumcraft" - url "https://maven.mcmoddev.com/" - } maven { name "ExNihilo" url "https://maven.tterrag.com/" @@ -18,14 +10,6 @@ repositories { artifact() } } - maven { - name "IC2" - url "https://maven.ic2.player.to/" - metadataSources { - mavenPom() - artifact() - } - } ivy { name "MineTweaker3" artifactPattern "http://minetweaker3.powerofbytes.com/download/[module](-[classifier])-[revision].[ext]" @@ -33,12 +17,4 @@ repositories { artifact() } } - maven { - name "CurseMaven" - url "https://www.cursemaven.com/" - } - maven { - name "Jitpack" - url "https://jitpack.io/" - } } diff --git a/src/main/java/modtweaker2/ClientEvents.java b/src/main/java/modtweaker2/ClientEvents.java index d27961c..c72ba58 100644 --- a/src/main/java/modtweaker2/ClientEvents.java +++ b/src/main/java/modtweaker2/ClientEvents.java @@ -2,15 +2,14 @@ package modtweaker2; import static modtweaker2.helpers.LogHelper.print; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; - import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import minetweaker.api.item.IItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.player.IPlayer; public class ClientEvents { diff --git a/src/main/java/modtweaker2/ModTweaker2.java b/src/main/java/modtweaker2/ModTweaker2.java index 9e4a4f4..f16597f 100644 --- a/src/main/java/modtweaker2/ModTweaker2.java +++ b/src/main/java/modtweaker2/ModTweaker2.java @@ -2,6 +2,21 @@ package modtweaker2; import java.io.File; +import net.minecraftforge.common.MinecraftForge; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.relauncher.Side; import minetweaker.MineTweakerImplementationAPI; import minetweaker.MineTweakerImplementationAPI.ReloadEvent; import minetweaker.runtime.providers.ScriptProviderDirectory; @@ -28,22 +43,6 @@ import modtweaker2.mods.thermalexpansion.ThermalExpansion; import modtweaker2.proxy.CommonProxy; import modtweaker2.utils.TweakerPlugin; -import net.minecraftforge.common.MinecraftForge; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.event.FMLServerStartingEvent; -import cpw.mods.fml.relauncher.Side; - @Mod(modid = ModProps.modid, version = ModProps.version, dependencies = ModProps.dependencies) public class ModTweaker2 { diff --git a/src/main/java/modtweaker2/commands/EntityMappingLogger.java b/src/main/java/modtweaker2/commands/EntityMappingLogger.java index 5af2215..6c55232 100644 --- a/src/main/java/modtweaker2/commands/EntityMappingLogger.java +++ b/src/main/java/modtweaker2/commands/EntityMappingLogger.java @@ -2,14 +2,14 @@ package modtweaker2.commands; import java.util.Set; +import net.minecraft.entity.EntityList; + import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; import modtweaker2.ModTweaker2; -import net.minecraft.entity.EntityList; - public class EntityMappingLogger implements ICommandFunction { @Override diff --git a/src/main/java/modtweaker2/helpers/InputHelper.java b/src/main/java/modtweaker2/helpers/InputHelper.java index c5982cf..44d112f 100644 --- a/src/main/java/modtweaker2/helpers/InputHelper.java +++ b/src/main/java/modtweaker2/helpers/InputHelper.java @@ -3,6 +3,13 @@ package modtweaker2.helpers; import java.lang.reflect.Array; import java.util.ArrayList; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import minetweaker.api.entity.IEntity; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -11,13 +18,6 @@ import minetweaker.api.oredict.IOreDictEntry; import minetweaker.mc1710.item.MCItemStack; import minetweaker.mc1710.liquid.MCLiquidStack; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - public class InputHelper { public static boolean isABlock(IItemStack block) { diff --git a/src/main/java/modtweaker2/helpers/LogHelper.java b/src/main/java/modtweaker2/helpers/LogHelper.java index 732a305..42bc539 100644 --- a/src/main/java/modtweaker2/helpers/LogHelper.java +++ b/src/main/java/modtweaker2/helpers/LogHelper.java @@ -4,6 +4,16 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import net.minecraft.block.Block; +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.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + import mekanism.api.gas.GasStack; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -15,17 +25,6 @@ import modtweaker2.mods.mekanism.gas.MCGasStack; import modtweaker2.mods.thaumcraft.aspect.AspectStack; import modtweaker2.mods.thaumcraft.aspect.MCAspectStack; import modtweaker2.utils.TweakerPlugin; - -import net.minecraft.block.Block; -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.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/modtweaker2/helpers/StackHelper.java b/src/main/java/modtweaker2/helpers/StackHelper.java index cc37b5e..b59c0bd 100644 --- a/src/main/java/modtweaker2/helpers/StackHelper.java +++ b/src/main/java/modtweaker2/helpers/StackHelper.java @@ -2,6 +2,9 @@ package modtweaker2.helpers; import static modtweaker2.helpers.InputHelper.toStack; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IngredientAny; @@ -11,9 +14,6 @@ import modtweaker2.mods.mekanism.MekanismHelper; import modtweaker2.mods.mekanism.gas.IGasStack; import modtweaker2.utils.TweakerPlugin; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - public class StackHelper { /** diff --git a/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java b/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java index c8048c2..0f22a70 100644 --- a/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java +++ b/src/main/java/modtweaker2/mods/appeng/commands/AppliedEnergisticsLogger.java @@ -4,15 +4,15 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import appeng.api.AEApi; +import appeng.api.features.IGrinderEntry; +import appeng.api.features.IInscriberRecipe; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.StringHelper; -import appeng.api.AEApi; -import appeng.api.features.IGrinderEntry; -import appeng.api.features.IInscriberRecipe; public class AppliedEnergisticsLogger implements ICommandFunction { diff --git a/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java b/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java index 90951ab..66142ea 100644 --- a/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java +++ b/src/main/java/modtweaker2/mods/appeng/handlers/Grind.java @@ -6,6 +6,9 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; +import appeng.api.AEApi; +import appeng.api.features.IGrinderEntry; +import appeng.core.features.registries.entries.AppEngGrinderRecipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -18,9 +21,6 @@ import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import appeng.api.AEApi; -import appeng.api.features.IGrinderEntry; -import appeng.core.features.registries.entries.AppEngGrinderRecipe; @ZenClass("mods.appeng.Grinder") public class Grind { diff --git a/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java b/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java index 809b1f7..3b176c3 100644 --- a/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java +++ b/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java @@ -8,6 +8,10 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.ArrayList; import java.util.LinkedList; +import appeng.api.AEApi; +import appeng.api.features.IInscriberRecipe; +import appeng.api.features.InscriberProcessType; +import appeng.core.features.registries.entries.InscriberRecipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -18,10 +22,6 @@ import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import appeng.api.AEApi; -import appeng.api.features.IInscriberRecipe; -import appeng.api.features.InscriberProcessType; -import appeng.core.features.registries.entries.InscriberRecipe; @ZenClass("mods.appeng.Inscriber") public class Inscriber { diff --git a/src/main/java/modtweaker2/mods/botania/Botania.java b/src/main/java/modtweaker2/mods/botania/Botania.java index b04f920..5dd077b 100644 --- a/src/main/java/modtweaker2/mods/botania/Botania.java +++ b/src/main/java/modtweaker2/mods/botania/Botania.java @@ -1,5 +1,7 @@ package modtweaker2.mods.botania; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import modtweaker2.mods.botania.handlers.Apothecary; import modtweaker2.mods.botania.handlers.Brew; @@ -9,9 +11,6 @@ import modtweaker2.mods.botania.handlers.ManaInfusion; import modtweaker2.mods.botania.handlers.Orechid; import modtweaker2.mods.botania.handlers.PureDaisy; import modtweaker2.mods.botania.handlers.RuneAltar; - -import net.minecraft.item.ItemStack; - import vazkii.botania.common.item.block.ItemBlockSpecialFlower; public class Botania { diff --git a/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java b/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java index c2338a1..1792f48 100644 --- a/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java +++ b/src/main/java/modtweaker2/mods/botania/commands/BotaniaLogger.java @@ -4,15 +4,14 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.StringHelper; - -import net.minecraft.item.ItemStack; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.api.recipe.RecipeElvenTrade; diff --git a/src/main/java/modtweaker2/mods/botania/handlers/Lexicon.java b/src/main/java/modtweaker2/mods/botania/handlers/Lexicon.java index 1a2c9f0..43fec4b 100644 --- a/src/main/java/modtweaker2/mods/botania/handlers/Lexicon.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/Lexicon.java @@ -7,6 +7,9 @@ import static modtweaker2.helpers.InputHelper.toStack; import java.util.ArrayList; import java.util.List; +import net.minecraft.entity.EntityList; +import net.minecraft.item.crafting.IRecipe; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -24,10 +27,6 @@ import modtweaker2.mods.botania.lexicon.RemoveRecipeMapping; import modtweaker2.mods.botania.lexicon.SetCategoryIcon; import modtweaker2.mods.botania.lexicon.SetCategoryPriority; import modtweaker2.mods.botania.lexicon.SetEntryKnowledgeType; - -import net.minecraft.entity.EntityList; -import net.minecraft.item.crafting.IRecipe; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/modtweaker2/mods/botania/handlers/PureDaisy.java b/src/main/java/modtweaker2/mods/botania/handlers/PureDaisy.java index 7d4046a..e16a287 100644 --- a/src/main/java/modtweaker2/mods/botania/handlers/PureDaisy.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/PureDaisy.java @@ -3,6 +3,9 @@ package modtweaker2.mods.botania.handlers; import java.util.LinkedList; import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -11,10 +14,6 @@ import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.StackHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/modtweaker2/mods/botania/lexicon/AddRecipeMapping.java b/src/main/java/modtweaker2/mods/botania/lexicon/AddRecipeMapping.java index 65eacdf..299d78d 100644 --- a/src/main/java/modtweaker2/mods/botania/lexicon/AddRecipeMapping.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/AddRecipeMapping.java @@ -1,9 +1,8 @@ package modtweaker2.mods.botania.lexicon; -import minetweaker.IUndoableAction; - import net.minecraft.item.ItemStack; +import minetweaker.IUndoableAction; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; diff --git a/src/main/java/modtweaker2/mods/botania/lexicon/RemoveRecipeMapping.java b/src/main/java/modtweaker2/mods/botania/lexicon/RemoveRecipeMapping.java index 9d17ab0..2bfefcb 100644 --- a/src/main/java/modtweaker2/mods/botania/lexicon/RemoveRecipeMapping.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/RemoveRecipeMapping.java @@ -1,9 +1,8 @@ package modtweaker2.mods.botania.lexicon; -import minetweaker.IUndoableAction; - import net.minecraft.item.ItemStack; +import minetweaker.IUndoableAction; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; diff --git a/src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryIcon.java b/src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryIcon.java index bfdcc0d..6860d15 100644 --- a/src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryIcon.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryIcon.java @@ -1,9 +1,8 @@ package modtweaker2.mods.botania.lexicon; -import minetweaker.IUndoableAction; - import net.minecraft.util.ResourceLocation; +import minetweaker.IUndoableAction; import vazkii.botania.api.lexicon.LexiconCategory; public class SetCategoryIcon implements IUndoableAction { diff --git a/src/main/java/modtweaker2/mods/botanicaladdons/handlers/DendricSuffuser.java b/src/main/java/modtweaker2/mods/botanicaladdons/handlers/DendricSuffuser.java index 543cb13..08308b4 100644 --- a/src/main/java/modtweaker2/mods/botanicaladdons/handlers/DendricSuffuser.java +++ b/src/main/java/modtweaker2/mods/botanicaladdons/handlers/DendricSuffuser.java @@ -7,6 +7,9 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -14,10 +17,6 @@ import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import ninja.shadowfox.shadowfox_botany.api.ShadowFoxAPI; import ninja.shadowfox.shadowfox_botany.api.recipe.RecipeTreeCrafting; import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker2/mods/botanicaladdons/handlers/IridescentTree.java b/src/main/java/modtweaker2/mods/botanicaladdons/handlers/IridescentTree.java index 6b2a303..8e12908 100644 --- a/src/main/java/modtweaker2/mods/botanicaladdons/handlers/IridescentTree.java +++ b/src/main/java/modtweaker2/mods/botanicaladdons/handlers/IridescentTree.java @@ -3,16 +3,15 @@ package modtweaker2.mods.botanicaladdons.handlers; import java.util.LinkedList; import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import ninja.shadowfox.shadowfox_botany.api.ShadowFoxAPI; import ninja.shadowfox.shadowfox_botany.api.trees.IIridescentSaplingVariant; import ninja.shadowfox.shadowfox_botany.api.trees.IridescentSaplingBaseVariant; diff --git a/src/main/java/modtweaker2/mods/chisel/ChiselHelper.java b/src/main/java/modtweaker2/mods/chisel/ChiselHelper.java index 9a24f02..f456449 100644 --- a/src/main/java/modtweaker2/mods/chisel/ChiselHelper.java +++ b/src/main/java/modtweaker2/mods/chisel/ChiselHelper.java @@ -6,8 +6,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import minetweaker.api.item.IItemStack; - import net.minecraft.block.Block; import com.cricketcraft.chisel.api.carving.CarvingUtils; @@ -15,6 +13,8 @@ import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.google.common.collect.Lists; +import minetweaker.api.item.IItemStack; + public class ChiselHelper { public static ICarvingGroup getGroup(String name) { diff --git a/src/main/java/modtweaker2/mods/chisel/commands/ChiselGroupLogger.java b/src/main/java/modtweaker2/mods/chisel/commands/ChiselGroupLogger.java index 175a0d2..52ccd06 100644 --- a/src/main/java/modtweaker2/mods/chisel/commands/ChiselGroupLogger.java +++ b/src/main/java/modtweaker2/mods/chisel/commands/ChiselGroupLogger.java @@ -2,13 +2,13 @@ package modtweaker2.mods.chisel.commands; import java.util.List; +import com.cricketcraft.chisel.api.carving.CarvingUtils; + import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import com.cricketcraft.chisel.api.carving.CarvingUtils; - public class ChiselGroupLogger implements ICommandFunction { @Override diff --git a/src/main/java/modtweaker2/mods/chisel/commands/ChiselVariationLogger.java b/src/main/java/modtweaker2/mods/chisel/commands/ChiselVariationLogger.java index 4026563..8df0b66 100644 --- a/src/main/java/modtweaker2/mods/chisel/commands/ChiselVariationLogger.java +++ b/src/main/java/modtweaker2/mods/chisel/commands/ChiselVariationLogger.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.api.player.IPlayer; -import minetweaker.api.server.ICommandFunction; -import modtweaker2.mods.chisel.ChiselHelper; - import net.minecraft.item.Item; import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import minetweaker.MineTweakerAPI; +import minetweaker.MineTweakerImplementationAPI; +import minetweaker.api.player.IPlayer; +import minetweaker.api.server.ICommandFunction; +import modtweaker2.mods.chisel.ChiselHelper; + public class ChiselVariationLogger implements ICommandFunction { @Override diff --git a/src/main/java/modtweaker2/mods/chisel/handlers/Groups.java b/src/main/java/modtweaker2/mods/chisel/handlers/Groups.java index 8f0f3ee..8945bc2 100644 --- a/src/main/java/modtweaker2/mods/chisel/handlers/Groups.java +++ b/src/main/java/modtweaker2/mods/chisel/handlers/Groups.java @@ -1,5 +1,9 @@ package modtweaker2.mods.chisel.handlers; +import com.cricketcraft.chisel.api.carving.CarvingUtils; +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -7,10 +11,6 @@ import modtweaker2.mods.chisel.ChiselHelper; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import com.cricketcraft.chisel.api.carving.CarvingUtils; -import com.cricketcraft.chisel.api.carving.ICarvingGroup; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; - @ZenClass("mods.chisel.Groups") public class Groups { diff --git a/src/main/java/modtweaker2/mods/exnihilo/ExNihiloHelper.java b/src/main/java/modtweaker2/mods/exnihilo/ExNihiloHelper.java index e1d1cb2..6a44504 100644 --- a/src/main/java/modtweaker2/mods/exnihilo/ExNihiloHelper.java +++ b/src/main/java/modtweaker2/mods/exnihilo/ExNihiloHelper.java @@ -2,9 +2,9 @@ package modtweaker2.mods.exnihilo; import java.util.Map; -import modtweaker2.helpers.ReflectionHelper; import exnihilo.registries.HeatRegistry; import exnihilo.utils.ItemInfo; +import modtweaker2.helpers.ReflectionHelper; public class ExNihiloHelper { diff --git a/src/main/java/modtweaker2/mods/exnihilo/commands/ExNihiloLogger.java b/src/main/java/modtweaker2/mods/exnihilo/commands/ExNihiloLogger.java index 39736c9..281ce2a 100644 --- a/src/main/java/modtweaker2/mods/exnihilo/commands/ExNihiloLogger.java +++ b/src/main/java/modtweaker2/mods/exnihilo/commands/ExNihiloLogger.java @@ -6,14 +6,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; -import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.api.player.IPlayer; -import minetweaker.api.server.ICommandFunction; -import modtweaker2.helpers.LogHelper; -import modtweaker2.helpers.StringHelper; -import modtweaker2.mods.exnihilo.ExNihiloHelper; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -26,6 +18,13 @@ import exnihilo.registries.helpers.Meltable; import exnihilo.registries.helpers.SiftingResult; import exnihilo.registries.helpers.Smashable; import exnihilo.utils.ItemInfo; +import minetweaker.MineTweakerAPI; +import minetweaker.MineTweakerImplementationAPI; +import minetweaker.api.player.IPlayer; +import minetweaker.api.server.ICommandFunction; +import modtweaker2.helpers.LogHelper; +import modtweaker2.helpers.StringHelper; +import modtweaker2.mods.exnihilo.ExNihiloHelper; public class ExNihiloLogger implements ICommandFunction { diff --git a/src/main/java/modtweaker2/mods/exnihilo/handlers/Compost.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Compost.java index eaaf707..adb9e1c 100644 --- a/src/main/java/modtweaker2/mods/exnihilo/handlers/Compost.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Compost.java @@ -8,6 +8,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; +import exnihilo.registries.CompostRegistry; +import exnihilo.registries.helpers.Color; +import exnihilo.registries.helpers.Compostable; +import exnihilo.utils.ItemInfo; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -17,10 +21,6 @@ import modtweaker2.utils.BaseMapRemoval; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import exnihilo.registries.CompostRegistry; -import exnihilo.registries.helpers.Color; -import exnihilo.registries.helpers.Compostable; -import exnihilo.utils.ItemInfo; @ZenClass("mods.exnihilo.Composting") public class Compost { diff --git a/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java index 87841c2..6ac1d91 100644 --- a/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java @@ -11,6 +11,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import exnihilo.registries.CrucibleRegistry; +import exnihilo.registries.helpers.Meltable; +import exnihilo.utils.ItemInfo; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -19,16 +26,8 @@ import modtweaker2.helpers.LogHelper; import modtweaker2.mods.exnihilo.ExNihiloHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import exnihilo.registries.CrucibleRegistry; -import exnihilo.registries.helpers.Meltable; -import exnihilo.utils.ItemInfo; @ZenClass("mods.exnihilo.Crucible") public class Crucible { diff --git a/src/main/java/modtweaker2/mods/exnihilo/handlers/Hammer.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Hammer.java index daaf0bb..e2e3861 100644 --- a/src/main/java/modtweaker2/mods/exnihilo/handlers/Hammer.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Hammer.java @@ -11,6 +11,12 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import exnihilo.registries.HammerRegistry; +import exnihilo.registries.helpers.Smashable; +import exnihilo.utils.ItemInfo; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -18,16 +24,9 @@ import minetweaker.api.item.IngredientAny; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import exnihilo.registries.HammerRegistry; -import exnihilo.registries.helpers.Smashable; -import exnihilo.utils.ItemInfo; @ZenClass("mods.exnihilo.Hammer") public class Hammer { diff --git a/src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java index d7c5477..8135023 100644 --- a/src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java @@ -11,6 +11,11 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import exnihilo.registries.SieveRegistry; +import exnihilo.registries.helpers.SiftingResult; +import exnihilo.utils.ItemInfo; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -18,15 +23,9 @@ import minetweaker.api.item.IngredientAny; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import exnihilo.registries.SieveRegistry; -import exnihilo.registries.helpers.SiftingResult; -import exnihilo.utils.ItemInfo; @ZenClass("mods.exnihilo.Sieve") public class Sieve { diff --git a/src/main/java/modtweaker2/mods/extendedworkbench/handlers/ExtendedCrafting.java b/src/main/java/modtweaker2/mods/extendedworkbench/handlers/ExtendedCrafting.java index 0fd10bb..51d05ef 100644 --- a/src/main/java/modtweaker2/mods/extendedworkbench/handlers/ExtendedCrafting.java +++ b/src/main/java/modtweaker2/mods/extendedworkbench/handlers/ExtendedCrafting.java @@ -6,6 +6,9 @@ import static modtweaker2.helpers.InputHelper.toStacks; import java.util.Arrays; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -16,10 +19,6 @@ import naruto1310.extendedWorkbench.crafting.ExtendedCraftingManager; import naruto1310.extendedWorkbench.crafting.ExtendedShapedRecipes; import naruto1310.extendedWorkbench.crafting.ExtendedShapelessRecipes; import naruto1310.extendedWorkbench.crafting.IExtendedRecipe; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/extraUtils/handlers/QED.java b/src/main/java/modtweaker2/mods/extraUtils/handlers/QED.java index 33bcc0c..d88c7e6 100644 --- a/src/main/java/modtweaker2/mods/extraUtils/handlers/QED.java +++ b/src/main/java/modtweaker2/mods/extraUtils/handlers/QED.java @@ -5,6 +5,11 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import com.rwtema.extrautils.tileentity.enderconstructor.EnderConstructorRecipesHandler; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -12,15 +17,9 @@ import modtweaker2.helpers.InputHelper; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.ShapedOreRecipe; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import com.rwtema.extrautils.tileentity.enderconstructor.EnderConstructorRecipesHandler; - @ZenClass("mods.extraUtils.QED") public class QED { diff --git a/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java b/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java index c528498..ad53734 100644 --- a/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java +++ b/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java @@ -4,10 +4,10 @@ import static modtweaker2.helpers.ReflectionHelper.getStaticObject; import java.util.List; -import modtweaker2.helpers.ReflectionHelper; - import net.minecraft.item.ItemStack; +import modtweaker2.helpers.ReflectionHelper; + public class FactorizationHelper { @SuppressWarnings("rawtypes") diff --git a/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java b/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java index 5413ebf..5325076 100644 --- a/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java +++ b/src/main/java/modtweaker2/mods/factorization/commands/FactorizationLogger.java @@ -4,6 +4,8 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; @@ -13,8 +15,6 @@ import modtweaker2.helpers.ReflectionHelper; import modtweaker2.helpers.StringHelper; import modtweaker2.mods.factorization.FactorizationHelper; -import net.minecraft.item.ItemStack; - public class FactorizationLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); diff --git a/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java b/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java index 6e00348..6a46ccd 100644 --- a/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -15,9 +17,6 @@ import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.factorization.FactorizationHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java b/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java index 166d790..21ab3c8 100644 --- a/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java @@ -8,6 +8,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -16,9 +18,6 @@ import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.factorization.FactorizationHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java b/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java index b7cac00..2110f03 100644 --- a/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -15,9 +17,6 @@ import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.factorization.FactorizationHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/forestry/ForestryListAddition.java b/src/main/java/modtweaker2/mods/forestry/ForestryListAddition.java index 25a26c9..ed254dc 100644 --- a/src/main/java/modtweaker2/mods/forestry/ForestryListAddition.java +++ b/src/main/java/modtweaker2/mods/forestry/ForestryListAddition.java @@ -3,10 +3,10 @@ package modtweaker2.mods.forestry; import java.util.ArrayList; import java.util.List; -import modtweaker2.helpers.LogHelper; -import modtweaker2.utils.BaseListAddition; import forestry.api.recipes.ICraftingProvider; import forestry.api.recipes.IForestryRecipe; +import modtweaker2.helpers.LogHelper; +import modtweaker2.utils.BaseListAddition; public abstract class ForestryListAddition> extends BaseListAddition { diff --git a/src/main/java/modtweaker2/mods/forestry/ForestryListRemoval.java b/src/main/java/modtweaker2/mods/forestry/ForestryListRemoval.java index 9794ff2..dc10a63 100644 --- a/src/main/java/modtweaker2/mods/forestry/ForestryListRemoval.java +++ b/src/main/java/modtweaker2/mods/forestry/ForestryListRemoval.java @@ -3,10 +3,10 @@ package modtweaker2.mods.forestry; import java.util.ArrayList; import java.util.List; -import modtweaker2.helpers.LogHelper; -import modtweaker2.utils.BaseListRemoval; import forestry.api.recipes.ICraftingProvider; import forestry.api.recipes.IForestryRecipe; +import modtweaker2.helpers.LogHelper; +import modtweaker2.utils.BaseListRemoval; public abstract class ForestryListRemoval> extends BaseListRemoval { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java b/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java index 71f92c8..3223475 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java @@ -10,6 +10,12 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + +import forestry.api.recipes.ICarpenterManager; +import forestry.api.recipes.ICarpenterRecipe; +import forestry.api.recipes.IDescriptiveRecipe; +import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -19,16 +25,9 @@ import modtweaker2.mods.forestry.ForestryListAddition; import modtweaker2.mods.forestry.ForestryListRemoval; import modtweaker2.mods.forestry.recipes.CarpenterRecipe; import modtweaker2.mods.forestry.recipes.DescriptiveRecipe; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.api.recipes.ICarpenterManager; -import forestry.api.recipes.ICarpenterRecipe; -import forestry.api.recipes.IDescriptiveRecipe; -import forestry.api.recipes.RecipeManagers; @ZenClass("mods.forestry.Carpenter") public class Carpenter { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java b/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java index 08848e4..9350531 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java @@ -9,6 +9,11 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import net.minecraft.item.ItemStack; + +import forestry.api.recipes.ICentrifugeManager; +import forestry.api.recipes.ICentrifugeRecipe; +import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -17,14 +22,8 @@ import modtweaker2.helpers.LogHelper; import modtweaker2.mods.forestry.ForestryListAddition; import modtweaker2.mods.forestry.ForestryListRemoval; import modtweaker2.mods.forestry.recipes.CentrifugeRecipe; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.api.recipes.ICentrifugeManager; -import forestry.api.recipes.ICentrifugeRecipe; -import forestry.api.recipes.RecipeManagers; @ZenClass("mods.forestry.Centrifuge") public class Centrifuge { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java b/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java index 0145eff..e64b1a4 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java @@ -13,6 +13,13 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import forestry.api.fuels.FermenterFuel; +import forestry.api.fuels.FuelManager; +import forestry.api.recipes.IFermenterManager; +import forestry.api.recipes.IFermenterRecipe; +import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -23,16 +30,8 @@ import modtweaker2.mods.forestry.ForestryListRemoval; import modtweaker2.mods.forestry.recipes.FermenterRecipe; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.api.fuels.FermenterFuel; -import forestry.api.fuels.FuelManager; -import forestry.api.recipes.IFermenterManager; -import forestry.api.recipes.IFermenterRecipe; -import forestry.api.recipes.RecipeManagers; @ZenClass("mods.forestry.Fermenter") public class Fermenter { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java b/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java index 22c708e..2540de1 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java @@ -10,6 +10,13 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import forestry.api.fuels.FuelManager; +import forestry.api.fuels.MoistenerFuel; +import forestry.api.recipes.IMoistenerManager; +import forestry.api.recipes.IMoistenerRecipe; +import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -19,16 +26,8 @@ import modtweaker2.mods.forestry.ForestryListRemoval; import modtweaker2.mods.forestry.recipes.MoistenerRecipe; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.api.fuels.FuelManager; -import forestry.api.fuels.MoistenerFuel; -import forestry.api.recipes.IMoistenerManager; -import forestry.api.recipes.IMoistenerRecipe; -import forestry.api.recipes.RecipeManagers; @ZenClass("mods.forestry.Moistener") public class Moistener { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java b/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java index 7c80f10..f722fdb 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java @@ -10,6 +10,9 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import forestry.api.recipes.ISqueezerManager; +import forestry.api.recipes.ISqueezerRecipe; +import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -22,9 +25,6 @@ import modtweaker2.mods.forestry.recipes.SqueezerRecipe; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.api.recipes.ISqueezerManager; -import forestry.api.recipes.ISqueezerRecipe; -import forestry.api.recipes.RecipeManagers; @ZenClass("mods.forestry.Squeezer") public class Squeezer { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Still.java b/src/main/java/modtweaker2/mods/forestry/handlers/Still.java index 5681fc8..aa753dc 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Still.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Still.java @@ -7,6 +7,9 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import forestry.api.recipes.IStillManager; +import forestry.api.recipes.IStillRecipe; +import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.liquid.ILiquidStack; @@ -17,9 +20,6 @@ import modtweaker2.mods.forestry.recipes.StillRecipe; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.api.recipes.IStillManager; -import forestry.api.recipes.IStillRecipe; -import forestry.api.recipes.RecipeManagers; @ZenClass("mods.forestry.Still") public class Still { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java b/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java index 5274689..f491be9 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java @@ -6,6 +6,14 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraftforge.fluids.FluidRegistry; + +import forestry.api.recipes.IDescriptiveRecipe; +import forestry.api.recipes.IFabricatorManager; +import forestry.api.recipes.IFabricatorRecipe; +import forestry.api.recipes.IFabricatorSmeltingManager; +import forestry.api.recipes.IFabricatorSmeltingRecipe; +import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -16,18 +24,9 @@ import modtweaker2.mods.forestry.ForestryListRemoval; import modtweaker2.mods.forestry.recipes.DescriptiveRecipe; import modtweaker2.mods.forestry.recipes.FabricatorRecipe; import modtweaker2.mods.forestry.recipes.FabricatorSmeltingRecipe; - -import net.minecraftforge.fluids.FluidRegistry; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.api.recipes.IDescriptiveRecipe; -import forestry.api.recipes.IFabricatorManager; -import forestry.api.recipes.IFabricatorRecipe; -import forestry.api.recipes.IFabricatorSmeltingManager; -import forestry.api.recipes.IFabricatorSmeltingRecipe; -import forestry.api.recipes.RecipeManagers; @ZenClass("mods.forestry.ThermionicFabricator") public class ThermionicFabricator { diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/CentrifugeRecipe.java b/src/main/java/modtweaker2/mods/forestry/recipes/CentrifugeRecipe.java index 2b19dcf..8efa6f8 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/CentrifugeRecipe.java +++ b/src/main/java/modtweaker2/mods/forestry/recipes/CentrifugeRecipe.java @@ -9,6 +9,7 @@ import java.util.Random; import net.minecraft.item.ItemStack; import com.google.common.collect.ImmutableMap; + import forestry.api.recipes.ICentrifugeRecipe; public class CentrifugeRecipe implements ICentrifugeRecipe { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/BlastFurnace.java b/src/main/java/modtweaker2/mods/ic2c/mods/BlastFurnace.java index 4592dd3..4023f2e 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/BlastFurnace.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/BlastFurnace.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.BlastFurnace") public class BlastFurnace { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/BlockCutter.java b/src/main/java/modtweaker2/mods/ic2c/mods/BlockCutter.java index 3f9ec72..f910b31 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/BlockCutter.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/BlockCutter.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.BlockCutter") public class BlockCutter { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/Centrifuge.java b/src/main/java/modtweaker2/mods/ic2c/mods/Centrifuge.java index 134c19d..a27910a 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/Centrifuge.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/Centrifuge.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.Centrifuge") public class Centrifuge { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/Compressor.java b/src/main/java/modtweaker2/mods/ic2c/mods/Compressor.java index bb9e9cd..e99b0af 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/Compressor.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/Compressor.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.Compressor") public class Compressor { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/Extractor.java b/src/main/java/modtweaker2/mods/ic2c/mods/Extractor.java index 3075e47..cc360cb 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/Extractor.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/Extractor.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.Extractor") public class Extractor { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/Macerator.java b/src/main/java/modtweaker2/mods/ic2c/mods/Macerator.java index 46d96fb..65cd680 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/Macerator.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/Macerator.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.Macerator") public class Macerator { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerCutting.java b/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerCutting.java index f96534f..b3721dd 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerCutting.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerCutting.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.MetalFormerCutting") public class MetalFormerCutting { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerExtruding.java b/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerExtruding.java index 15a9703..b5b9d5a 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerExtruding.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerExtruding.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.MetalFormerExtruding") public class MetalFormerExtruding { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerRolling.java b/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerRolling.java index ad65a7f..c740ba5 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerRolling.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/MetalFormerRolling.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.MetalFormerRolling") public class MetalFormerRolling { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/OreWashing.java b/src/main/java/modtweaker2/mods/ic2c/mods/OreWashing.java index bca1663..3a66796 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/OreWashing.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/OreWashing.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.OreWashing") public class OreWashing { diff --git a/src/main/java/modtweaker2/mods/ic2c/mods/Recycler.java b/src/main/java/modtweaker2/mods/ic2c/mods/Recycler.java index de9b353..137591c 100644 --- a/src/main/java/modtweaker2/mods/ic2c/mods/Recycler.java +++ b/src/main/java/modtweaker2/mods/ic2c/mods/Recycler.java @@ -4,20 +4,19 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.InputHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.RecipeOutput; -import ic2.api.recipe.Recipes; @ZenClass("mods.ic2classic.Recycler") public class Recycler { diff --git a/src/main/java/modtweaker2/mods/mariculture/MaricultureHelper.java b/src/main/java/modtweaker2/mods/mariculture/MaricultureHelper.java index 1cee99c..6c332bd 100644 --- a/src/main/java/modtweaker2/mods/mariculture/MaricultureHelper.java +++ b/src/main/java/modtweaker2/mods/mariculture/MaricultureHelper.java @@ -4,6 +4,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import mariculture.api.core.FuelInfo; import mariculture.api.core.MaricultureHandlers; import mariculture.api.fishery.Fishing; @@ -11,11 +16,6 @@ import mariculture.api.fishery.Loot; import mariculture.api.fishery.Loot.Rarity; import modtweaker2.helpers.ReflectionHelper; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - public class MaricultureHelper { public static Map fuels = null; diff --git a/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java index 066deb1..a3b3e50 100644 --- a/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java @@ -11,6 +11,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + import mariculture.api.core.FuelInfo; import mariculture.api.core.MaricultureHandlers; import mariculture.api.core.RecipeSmelter; @@ -24,9 +26,6 @@ import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/mariculture/handlers/Fishing.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Fishing.java index 7cba483..f332dc2 100644 --- a/src/main/java/modtweaker2/mods/mariculture/handlers/Fishing.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Fishing.java @@ -7,6 +7,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import net.minecraft.item.ItemStack; + +import cpw.mods.fml.common.Loader; import mariculture.api.fishery.Loot; import mariculture.api.fishery.Loot.Rarity; import mariculture.api.fishery.RodType; @@ -15,13 +18,9 @@ import minetweaker.api.item.IItemStack; import modtweaker2.helpers.ReflectionHelper; import modtweaker2.mods.mariculture.MaricultureHelper; import modtweaker2.utils.BaseUndoable; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cpw.mods.fml.common.Loader; @ZenClass("mods.mariculture.Fishing") public class Fishing { diff --git a/src/main/java/modtweaker2/mods/metallurgy/MetallurgyHelper.java b/src/main/java/modtweaker2/mods/metallurgy/MetallurgyHelper.java index 49847a6..b26542e 100644 --- a/src/main/java/modtweaker2/mods/metallurgy/MetallurgyHelper.java +++ b/src/main/java/modtweaker2/mods/metallurgy/MetallurgyHelper.java @@ -3,14 +3,14 @@ package modtweaker2.mods.metallurgy; import java.util.ArrayList; import java.util.HashMap; -import modtweaker2.helpers.ReflectionHelper; - import net.minecraft.item.ItemStack; import com.teammetallurgy.metallurgy.recipes.AlloyerRecipes; import com.teammetallurgy.metallurgy.recipes.AlloyerRecipes.AlloyRecipe; import com.teammetallurgy.metallurgy.recipes.CrusherRecipes; +import modtweaker2.helpers.ReflectionHelper; + public class MetallurgyHelper { public static ArrayList alloyerRecipes = null; diff --git a/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java b/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java index 6b12dac..226e222 100644 --- a/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java +++ b/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import com.teammetallurgy.metallurgy.recipes.AlloyerRecipes.AlloyRecipe; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -17,8 +19,6 @@ import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import com.teammetallurgy.metallurgy.recipes.AlloyerRecipes.AlloyRecipe; - @ZenClass("mods.metallurgy.Alloyer") public class Alloyer { diff --git a/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java b/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java index 32e358c..3b2ff16 100644 --- a/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java +++ b/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java @@ -5,15 +5,14 @@ import static modtweaker2.helpers.StackHelper.areEqual; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.LogHelper; import modtweaker2.mods.metallurgy.MetallurgyHelper; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java index 7cbd968..93816c3 100644 --- a/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java +++ b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java @@ -8,15 +8,14 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.ItemStack; - import pneumaticCraft.api.recipe.AssemblyRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java index 2488254..421940d 100644 --- a/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java +++ b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java @@ -7,15 +7,14 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.ItemStack; - import pneumaticCraft.api.recipe.PressureChamberRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/railcraft/RailcraftHelper.java b/src/main/java/modtweaker2/mods/railcraft/RailcraftHelper.java index fccc761..ced2a72 100644 --- a/src/main/java/modtweaker2/mods/railcraft/RailcraftHelper.java +++ b/src/main/java/modtweaker2/mods/railcraft/RailcraftHelper.java @@ -3,6 +3,10 @@ package modtweaker2.mods.railcraft; import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.fluids.FluidStack; + import mods.railcraft.api.crafting.IBlastFurnaceRecipe; import mods.railcraft.api.crafting.ICokeOvenRecipe; import mods.railcraft.api.crafting.IRockCrusherRecipe; @@ -14,10 +18,6 @@ import mods.railcraft.common.util.crafting.RockCrusherCraftingManager.CrusherRec import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.ReflectionHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.fluids.FluidStack; - public class RailcraftHelper { public static List furnace = null; diff --git a/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java b/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java index 27fcafb..a4b6139 100644 --- a/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java +++ b/src/main/java/modtweaker2/mods/railcraft/commands/RailcraftLogger.java @@ -5,6 +5,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; + import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; @@ -18,9 +21,6 @@ import modtweaker2.helpers.ReflectionHelper; import modtweaker2.helpers.StringHelper; import modtweaker2.mods.railcraft.RailcraftHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; - public class RailcraftLogger implements ICommandFunction { private static final List validArguments = new LinkedList(); diff --git a/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java b/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java index 850071f..37351ba 100644 --- a/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java @@ -7,6 +7,10 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -17,11 +21,6 @@ import modtweaker2.helpers.StackHelper; import modtweaker2.mods.railcraft.RailcraftHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.oredict.OreDictionary; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java b/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java index 6464ee1..4020a97 100644 --- a/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java @@ -8,6 +8,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -19,9 +21,6 @@ import modtweaker2.helpers.LogHelper; import modtweaker2.mods.railcraft.RailcraftHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraftforge.oredict.OreDictionary; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java b/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java index 71ecb3d..fe4f21a 100644 --- a/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraftforge.oredict.OreDictionary; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -16,9 +18,6 @@ import modtweaker2.helpers.LogHelper; import modtweaker2.mods.railcraft.RailcraftHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraftforge.oredict.OreDictionary; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/railcraft/handlers/RollingMachine.java b/src/main/java/modtweaker2/mods/railcraft/handlers/RollingMachine.java index 9a45eaf..5ccb335 100644 --- a/src/main/java/modtweaker2/mods/railcraft/handlers/RollingMachine.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/RollingMachine.java @@ -6,6 +6,10 @@ import static modtweaker2.helpers.InputHelper.toStack; import java.util.List; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -13,11 +17,6 @@ import modtweaker2.helpers.LogHelper; import modtweaker2.mods.railcraft.RailcraftHelper; import modtweaker2.utils.BaseCraftingAddition; import modtweaker2.utils.BaseCraftingRemoval; - -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java b/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java index 21db3d5..8a7bc5c 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java +++ b/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java @@ -5,13 +5,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import mantle.utils.ItemMetaWrapper; -import modtweaker2.helpers.ReflectionHelper; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import mantle.utils.ItemMetaWrapper; +import modtweaker2.helpers.ReflectionHelper; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.AlloyMix; import tconstruct.library.crafting.CastingRecipe; diff --git a/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java b/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java index 77c93b4..05d321f 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java +++ b/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java @@ -5,6 +5,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import mantle.utils.ItemMetaWrapper; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -13,11 +17,6 @@ import minetweaker.api.server.ICommandFunction; import modtweaker2.helpers.LogHelper; import modtweaker2.helpers.StringHelper; import modtweaker2.mods.tconstruct.TConstructHelper; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - import tconstruct.library.crafting.AlloyMix; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.DryingRackRecipes; diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java index a259f92..84bb702 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java @@ -16,6 +16,11 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import mantle.utils.ItemMetaWrapper; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -27,12 +32,6 @@ import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; import modtweaker2.utils.BaseMapAddition; import modtweaker2.utils.BaseMapRemoval; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java index 23481a6..e1b0c09 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java @@ -6,15 +6,14 @@ import static modtweaker2.helpers.InputHelper.toStack; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import modtweaker2.helpers.LogHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -52,8 +51,7 @@ public class TiCTweaks { @ZenMethod public static void addRepairMaterial(IItemStack stack, String material, int value) { ItemStack input = toStack(stack); - MineTweakerAPI.apply( - new Add(PatternBuilder.instance.new ItemKey(input.getItem(), input.getItemDamage(), value, material))); + MineTweakerAPI.apply(new Add(new ItemKey(input.getItem(), input.getItemDamage(), value, material))); } // Tweaks for setting repair materials diff --git a/src/main/java/modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java b/src/main/java/modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java index 5185f2e..dc27550 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java @@ -3,6 +3,8 @@ package modtweaker2.mods.thaumcraft.aspect; import java.util.Collections; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; import minetweaker.api.item.IItemStack; @@ -11,9 +13,6 @@ import minetweaker.api.item.IngredientOr; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; - -import net.minecraft.item.ItemStack; - import thaumcraft.api.aspects.AspectList; public class MCAspectStack implements IAspectStack { diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java index 1575b2b..978bd03 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java @@ -9,6 +9,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -16,9 +18,6 @@ import modtweaker2.helpers.LogHelper; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thaumcraft.api.ThaumcraftApi; diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java index a6b98f4..2a80497 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java @@ -4,14 +4,13 @@ import static modtweaker2.helpers.InputHelper.toStack; import java.util.Arrays; +import net.minecraft.entity.EntityList; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import modtweaker2.utils.BaseUndoable; - -import net.minecraft.entity.EntityList; -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thaumcraft.api.ThaumcraftApi; diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java index 2c65e37..eace18c 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java @@ -8,6 +8,9 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.ItemStack; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; @@ -16,10 +19,6 @@ import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import modtweaker2.mods.thaumcraft.recipe.MTInfusionRecipe; import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thaumcraft.api.ThaumcraftApi; diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Research.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Research.java index 45d8e07..7b64ea0 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Research.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Research.java @@ -2,6 +2,9 @@ package modtweaker2.mods.thaumcraft.handlers; import static modtweaker2.helpers.InputHelper.toStack; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.util.ResourceLocation; + import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.player.IPlayer; @@ -23,10 +26,6 @@ import modtweaker2.mods.thaumcraft.research.RemoveResearch; import modtweaker2.mods.thaumcraft.research.RemoveTab; import modtweaker2.mods.thaumcraft.research.SetAspects; import modtweaker2.mods.thaumcraft.research.SetResearch; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.util.ResourceLocation; - import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Warp.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Warp.java index 0f90368..0aa504f 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Warp.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Warp.java @@ -6,13 +6,12 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import net.minecraft.item.ItemStack; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import modtweaker2.mods.thaumcraft.ThaumcraftHelper; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thaumcraft.api.ThaumcraftApi; diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java index 0977c51..d4918be 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java @@ -3,14 +3,13 @@ package modtweaker2.mods.thaumcraft.research; import static modtweaker2.helpers.StackHelper.areEqual; import static modtweaker2.mods.thaumcraft.ThaumcraftHelper.getResearchSafe; -import minetweaker.IUndoableAction; -import modtweaker2.mods.thaumcraft.ThaumcraftHelper; - import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import minetweaker.IUndoableAction; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.crafting.CrucibleRecipe; import thaumcraft.api.crafting.IArcaneRecipe; diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java index 675c4bd..2744035 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java @@ -1,9 +1,8 @@ package modtweaker2.mods.thaumcraft.research; -import minetweaker.IUndoableAction; - import net.minecraft.item.ItemStack; +import minetweaker.IUndoableAction; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/AddTab.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddTab.java index 95cbf89..350d147 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/AddTab.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddTab.java @@ -1,9 +1,8 @@ package modtweaker2.mods.thaumcraft.research; -import minetweaker.IUndoableAction; - import net.minecraft.util.ResourceLocation; +import minetweaker.IUndoableAction; import thaumcraft.api.research.ResearchCategories; public class AddTab implements IUndoableAction { diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java index 5ccf5f3..02bca28 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java @@ -7,11 +7,10 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; -import minetweaker.IUndoableAction; -import modtweaker2.helpers.LogHelper; - import org.apache.commons.lang3.ArrayUtils; +import minetweaker.IUndoableAction; +import modtweaker2.helpers.LogHelper; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchCategoryList; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/modtweaker2/mods/thaumcraft/research/RefreshResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/RefreshResearch.java index a6c6435..27af381 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/research/RefreshResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/RefreshResearch.java @@ -2,13 +2,12 @@ package modtweaker2.mods.thaumcraft.research; import static modtweaker2.helpers.StackHelper.areEqual; -import minetweaker.IUndoableAction; -import modtweaker2.mods.thaumcraft.ThaumcraftHelper; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import minetweaker.IUndoableAction; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.crafting.CrucibleRecipe; import thaumcraft.api.crafting.IArcaneRecipe; diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java b/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java index 219bfd0..302ee0c 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java @@ -5,8 +5,6 @@ import static modtweaker2.helpers.StackHelper.areEqualOrNull; import java.lang.reflect.Constructor; -import modtweaker2.helpers.LogHelper; - import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -17,6 +15,7 @@ import cofh.thermalexpansion.util.crafting.PulverizerManager.RecipePulverizer; import cofh.thermalexpansion.util.crafting.SawmillManager.RecipeSawmill; import cofh.thermalexpansion.util.crafting.SmelterManager.RecipeSmelter; import cofh.thermalexpansion.util.crafting.TransposerManager.RecipeTransposer; +import modtweaker2.helpers.LogHelper; public class ThermalHelper { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java b/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java index cccbfe3..c39fd10 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/commands/ThermalExpansionLogger.java @@ -4,12 +4,6 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import minetweaker.MineTweakerAPI; -import minetweaker.MineTweakerImplementationAPI; -import minetweaker.api.player.IPlayer; -import minetweaker.api.server.ICommandFunction; -import modtweaker2.helpers.LogHelper; -import modtweaker2.helpers.StringHelper; import cofh.thermalexpansion.util.crafting.CrucibleManager; import cofh.thermalexpansion.util.crafting.CrucibleManager.RecipeCrucible; import cofh.thermalexpansion.util.crafting.FurnaceManager; @@ -24,6 +18,12 @@ import cofh.thermalexpansion.util.crafting.SmelterManager; import cofh.thermalexpansion.util.crafting.SmelterManager.RecipeSmelter; import cofh.thermalexpansion.util.crafting.TransposerManager; import cofh.thermalexpansion.util.crafting.TransposerManager.RecipeTransposer; +import minetweaker.MineTweakerAPI; +import minetweaker.MineTweakerImplementationAPI; +import minetweaker.api.player.IPlayer; +import minetweaker.api.server.ICommandFunction; +import modtweaker2.helpers.LogHelper; +import modtweaker2.helpers.StringHelper; public class ThermalExpansionLogger implements ICommandFunction { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java index 7e1b356..abfb3b0 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java @@ -8,6 +8,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import cofh.thermalexpansion.util.crafting.CrucibleManager; +import cofh.thermalexpansion.util.crafting.CrucibleManager.RecipeCrucible; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -20,8 +22,6 @@ import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cofh.thermalexpansion.util.crafting.CrucibleManager; -import cofh.thermalexpansion.util.crafting.CrucibleManager.RecipeCrucible; @ZenClass("mods.thermalexpansion.Crucible") public class Crucible { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java index 4d48ed4..de943eb 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import cofh.thermalexpansion.util.crafting.FurnaceManager; +import cofh.thermalexpansion.util.crafting.FurnaceManager.RecipeFurnace; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -18,8 +20,6 @@ import modtweaker2.utils.BaseListAddition; import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cofh.thermalexpansion.util.crafting.FurnaceManager; -import cofh.thermalexpansion.util.crafting.FurnaceManager.RecipeFurnace; @ZenClass("mods.thermalexpansion.Furnace") public class Furnace { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Insolator.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Insolator.java index edc763b..e2ccf88 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Insolator.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Insolator.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import cofh.thermalexpansion.util.crafting.InsolatorManager; +import cofh.thermalexpansion.util.crafting.InsolatorManager.RecipeInsolator; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -19,8 +21,6 @@ import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cofh.thermalexpansion.util.crafting.InsolatorManager; -import cofh.thermalexpansion.util.crafting.InsolatorManager.RecipeInsolator; @ZenClass("mods.thermalexpansion.Insolator") public class Insolator { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java index da05319..392db1b 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import cofh.thermalexpansion.util.crafting.PulverizerManager; +import cofh.thermalexpansion.util.crafting.PulverizerManager.RecipePulverizer; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -19,8 +21,6 @@ import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cofh.thermalexpansion.util.crafting.PulverizerManager; -import cofh.thermalexpansion.util.crafting.PulverizerManager.RecipePulverizer; @ZenClass("mods.thermalexpansion.Pulverizer") public class Pulverizer { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java index f095260..753a862 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import cofh.thermalexpansion.util.crafting.SawmillManager; +import cofh.thermalexpansion.util.crafting.SawmillManager.RecipeSawmill; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -19,8 +21,6 @@ import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cofh.thermalexpansion.util.crafting.SawmillManager; -import cofh.thermalexpansion.util.crafting.SawmillManager.RecipeSawmill; @ZenClass("mods.thermalexpansion.Sawmill") public class Sawmill { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java index 4864f2f..afa6e5c 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java @@ -7,6 +7,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import cofh.thermalexpansion.util.crafting.SmelterManager; +import cofh.thermalexpansion.util.crafting.SmelterManager.RecipeSmelter; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -19,8 +21,6 @@ import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cofh.thermalexpansion.util.crafting.SmelterManager; -import cofh.thermalexpansion.util.crafting.SmelterManager.RecipeSmelter; @ZenClass("mods.thermalexpansion.Smelter") public class Smelter { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java index 7864330..3793a29 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java @@ -9,6 +9,8 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; +import cofh.thermalexpansion.util.crafting.TransposerManager; +import cofh.thermalexpansion.util.crafting.TransposerManager.RecipeTransposer; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; @@ -23,8 +25,6 @@ import modtweaker2.utils.BaseListRemoval; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import cofh.thermalexpansion.util.crafting.TransposerManager; -import cofh.thermalexpansion.util.crafting.TransposerManager.RecipeTransposer; @ZenClass("mods.thermalexpansion.Transposer") public class Transposer { diff --git a/src/main/java/modtweaker2/utils/BaseCraftingAddition.java b/src/main/java/modtweaker2/utils/BaseCraftingAddition.java index 421f38c..3429798 100644 --- a/src/main/java/modtweaker2/utils/BaseCraftingAddition.java +++ b/src/main/java/modtweaker2/utils/BaseCraftingAddition.java @@ -2,10 +2,10 @@ package modtweaker2.utils; import java.util.List; -import modtweaker2.helpers.LogHelper; - import net.minecraft.item.crafting.IRecipe; +import modtweaker2.helpers.LogHelper; + public abstract class BaseCraftingAddition extends BaseListAddition { protected BaseCraftingAddition(String name, List list) { diff --git a/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java b/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java index b6f6477..77a184b 100644 --- a/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java +++ b/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java @@ -6,12 +6,12 @@ import static modtweaker2.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; -import minetweaker.api.item.IIngredient; -import modtweaker2.helpers.LogHelper; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import minetweaker.api.item.IIngredient; +import modtweaker2.helpers.LogHelper; + public class BaseCraftingRemoval extends BaseListRemoval { public BaseCraftingRemoval(String name, List list, List recipes) {