diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java index 6e81955..ac1ea60 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/GlobalRegistry.java @@ -6,20 +6,11 @@ package minetweaker.runtime; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.logging.Logger; import minetweaker.IBracketHandler; import minetweaker.IRecipeRemover; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; +import stanhebben.zenscript.IZenCompileEnvironment; import stanhebben.zenscript.IZenErrorLogger; import stanhebben.zenscript.TypeExpansion; import stanhebben.zenscript.annotations.ZenExpansion; @@ -28,18 +19,20 @@ import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.compiler.TypeRegistry; import stanhebben.zenscript.expression.partial.IPartialExpression; import stanhebben.zenscript.parser.Token; -import stanhebben.zenscript.IZenCompileEnvironment; -import stanhebben.zenscript.symbols.IZenSymbol; -import stanhebben.zenscript.symbols.SymbolJavaStaticField; -import stanhebben.zenscript.symbols.SymbolJavaStaticMethod; -import stanhebben.zenscript.symbols.SymbolPackage; -import stanhebben.zenscript.symbols.SymbolType; +import stanhebben.zenscript.symbols.*; import stanhebben.zenscript.type.ZenType; import stanhebben.zenscript.type.ZenTypeNative; import stanhebben.zenscript.type.natives.IJavaMethod; import stanhebben.zenscript.type.natives.JavaMethod; import stanhebben.zenscript.util.ZenPosition; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Type; +import java.util.*; +import java.util.logging.Level; +import java.util.logging.Logger; + /** * * @author Stan diff --git a/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java b/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java index 083e9a1..c066e40 100644 --- a/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java +++ b/MineTweaker3-MC1102-Mod-JEI/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java @@ -3,7 +3,6 @@ package minetweaker.mods.jei; import mezz.jei.api.*; import minetweaker.MineTweakerImplementationAPI; import minetweaker.util.IEventHandler; -import sun.util.resources.cldr.zh.TimeZoneNames_zh; import javax.annotation.Nonnull; @@ -26,7 +25,7 @@ public class JEIAddonPlugin implements IModPlugin { @Override public void onRuntimeAvailable(@Nonnull IJeiRuntime iJeiRuntime) { this.recipeRegistry = iJeiRuntime.getRecipeRegistry(); - if(!eventAdded){ + if (!eventAdded) { MineTweakerImplementationAPI.onPostReload(new IEventHandler() { @Override public void handle(MineTweakerImplementationAPI.ReloadEvent event) { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java index 8a9cf64..76746d6 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java @@ -6,25 +6,12 @@ package minetweaker.mc1710.item; -import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import cpw.mods.fml.relauncher.ReflectionHelper; import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlock; import minetweaker.api.data.DataMap; import minetweaker.api.data.IData; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemCondition; -import minetweaker.api.item.IItemDefinition; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IItemTransformer; -import minetweaker.api.item.IngredientItem; -import minetweaker.api.item.IngredientOr; -import minetweaker.api.item.WeightedItemStack; +import minetweaker.api.item.*; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; @@ -44,6 +31,12 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; + /** * * @author Stan