diff options
Diffstat (limited to 'src/main/java/kubatech/loaders')
16 files changed, 71 insertions, 78 deletions
diff --git a/src/main/java/kubatech/loaders/BlockLoader.java b/src/main/java/kubatech/loaders/BlockLoader.java index 099401eb15..e6f8d5b8ed 100644 --- a/src/main/java/kubatech/loaders/BlockLoader.java +++ b/src/main/java/kubatech/loaders/BlockLoader.java @@ -20,6 +20,10 @@ package kubatech.loaders; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemBlock; + +import cpw.mods.fml.common.registry.GameRegistry; import kubatech.api.enums.ItemList; import kubatech.loaders.block.KubaBlock; import kubatech.loaders.block.KubaItemBlock; @@ -28,11 +32,6 @@ import kubatech.loaders.block.blocks.TeaStorage; import kubatech.tileentity.TeaAcceptorTile; import kubatech.tileentity.TeaStorageTile; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemBlock; - -import cpw.mods.fml.common.registry.GameRegistry; - public class BlockLoader { public static final KubaBlock kubaBlock = new KubaBlock(Material.anvil); diff --git a/src/main/java/kubatech/loaders/ItemLoader.java b/src/main/java/kubatech/loaders/ItemLoader.java index 110b1d0ede..03af96a406 100644 --- a/src/main/java/kubatech/loaders/ItemLoader.java +++ b/src/main/java/kubatech/loaders/ItemLoader.java @@ -22,10 +22,10 @@ package kubatech.loaders; import static kubatech.api.enums.ItemList.*; +import cpw.mods.fml.common.registry.GameRegistry; import kubatech.loaders.item.ItemProxy; import kubatech.loaders.item.KubaItems; import kubatech.loaders.item.items.*; -import cpw.mods.fml.common.registry.GameRegistry; public class ItemLoader { diff --git a/src/main/java/kubatech/loaders/MTLoader.java b/src/main/java/kubatech/loaders/MTLoader.java index 306197267e..133a876f02 100644 --- a/src/main/java/kubatech/loaders/MTLoader.java +++ b/src/main/java/kubatech/loaders/MTLoader.java @@ -20,12 +20,12 @@ package kubatech.loaders; -import kubatech.Tags; -import minetweaker.MineTweakerImplementationAPI; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import kubatech.Tags; +import minetweaker.MineTweakerImplementationAPI; + public class MTLoader { private static final Logger LOG = LogManager.getLogger(Tags.MODID + "[MT Loader]"); diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java index cfac6bc925..2c0bbf464f 100644 --- a/src/main/java/kubatech/loaders/MobRecipeLoader.java +++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java @@ -34,24 +34,6 @@ import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; -import kubatech.Tags; -import kubatech.api.LoaderReference; -import kubatech.api.helpers.EnderIOHelper; -import kubatech.api.helpers.InfernalHelper; -import kubatech.api.helpers.ProgressBarWrapper; -import kubatech.api.mobhandler.MobDrop; -import kubatech.api.network.LoadConfigPacket; -import kubatech.api.utils.GSONUtils; -import kubatech.api.utils.ModUtils; -import kubatech.config.Config; -import kubatech.config.OverridesConfig; -import kubatech.nei.Mob_Handler; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; -import minetweaker.MineTweakerAPI; -import minetweaker.api.entity.IEntityDefinition; -import minetweaker.api.item.IItemStack; -import minetweaker.mc1710.item.MCItemStack; - import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -74,19 +56,35 @@ import net.minecraft.world.World; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import stanhebben.zenscript.value.IntRange; -import thaumcraft.common.items.wands.ItemWandCasting; -import atomicstryker.infernalmobs.common.InfernalMobsCore; -import atomicstryker.infernalmobs.common.MobModifier; -import atomicstryker.infernalmobs.common.mods.api.ModifierLoader; - import com.google.common.io.Files; import com.google.gson.Gson; +import atomicstryker.infernalmobs.common.InfernalMobsCore; +import atomicstryker.infernalmobs.common.MobModifier; +import atomicstryker.infernalmobs.common.mods.api.ModifierLoader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.util.GT_Utility; import gregtech.common.GT_DummyWorld; +import kubatech.Tags; +import kubatech.api.LoaderReference; +import kubatech.api.helpers.EnderIOHelper; +import kubatech.api.helpers.InfernalHelper; +import kubatech.api.helpers.ProgressBarWrapper; +import kubatech.api.mobhandler.MobDrop; +import kubatech.api.network.LoadConfigPacket; +import kubatech.api.utils.GSONUtils; +import kubatech.api.utils.ModUtils; +import kubatech.config.Config; +import kubatech.config.OverridesConfig; +import kubatech.nei.Mob_Handler; +import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; +import minetweaker.MineTweakerAPI; +import minetweaker.api.entity.IEntityDefinition; +import minetweaker.api.item.IItemStack; +import minetweaker.mc1710.item.MCItemStack; +import stanhebben.zenscript.value.IntRange; +import thaumcraft.common.items.wands.ItemWandCasting; public class MobRecipeLoader { diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 1656d0bc9d..4eb196a94e 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -24,13 +24,6 @@ import static kubatech.api.enums.ItemList.*; import java.lang.reflect.InvocationTargetException; -import kubatech.Tags; -import kubatech.api.LoaderReference; -import kubatech.api.enums.ItemList; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; -import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -50,6 +43,12 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; +import kubatech.Tags; +import kubatech.api.LoaderReference; +import kubatech.api.enums.ItemList; +import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; +import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse; +import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary; public class RecipeLoader { diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java index 8f2b48ceaa..3b9fdc392a 100644 --- a/src/main/java/kubatech/loaders/TCLoader.java +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -25,15 +25,15 @@ import java.util.Arrays; import java.util.HashSet; import java.util.stream.Collectors; -import kubatech.api.LoaderReference; -import kubatech.api.enums.ItemList; -import kubatech.api.utils.ItemID; -import kubatech.loaders.item.items.TeaUltimate; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import kubatech.api.LoaderReference; +import kubatech.api.enums.ItemList; +import kubatech.api.utils.ItemID; +import kubatech.loaders.item.items.TeaUltimate; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; @@ -42,7 +42,6 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import cpw.mods.fml.common.registry.GameRegistry; public class TCLoader { diff --git a/src/main/java/kubatech/loaders/block/BlockProxy.java b/src/main/java/kubatech/loaders/block/BlockProxy.java index e5238bf2f3..86f403a0c8 100644 --- a/src/main/java/kubatech/loaders/block/BlockProxy.java +++ b/src/main/java/kubatech/loaders/block/BlockProxy.java @@ -24,8 +24,6 @@ import static kubatech.loaders.block.KubaBlock.defaultTileEntityUI; import java.util.List; -import kubatech.Tags; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -38,6 +36,8 @@ import net.minecraft.world.World; import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; +import kubatech.Tags; + public class BlockProxy { private final String unlocalizedName; diff --git a/src/main/java/kubatech/loaders/block/KubaBlock.java b/src/main/java/kubatech/loaders/block/KubaBlock.java index 8d4d53f04d..ac722358e1 100644 --- a/src/main/java/kubatech/loaders/block/KubaBlock.java +++ b/src/main/java/kubatech/loaders/block/KubaBlock.java @@ -27,8 +27,6 @@ import java.util.HashMap; import java.util.List; import java.util.function.Function; -import kubatech.loaders.BlockLoader; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -51,6 +49,8 @@ import com.gtnewhorizons.modularui.common.builder.UIInfo; import com.gtnewhorizons.modularui.common.internal.wrapper.ModularGui; import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer; +import kubatech.loaders.BlockLoader; + public class KubaBlock extends Block { public static final Function<IModularUIContainerCreator, UIInfo<?, ?>> TileEntityUIFactory = containerConstructor -> UIBuilder diff --git a/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java b/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java index 0420ba82cb..d06466094a 100644 --- a/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java +++ b/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java @@ -22,10 +22,6 @@ package kubatech.loaders.block.blocks; import java.util.List; -import kubatech.loaders.block.BlockProxy; -import kubatech.loaders.block.IProxyTileEntityProvider; -import kubatech.tileentity.TeaAcceptorTile; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -33,6 +29,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import kubatech.loaders.block.BlockProxy; +import kubatech.loaders.block.IProxyTileEntityProvider; +import kubatech.tileentity.TeaAcceptorTile; + public class TeaAcceptor extends BlockProxy implements IProxyTileEntityProvider { public TeaAcceptor() { diff --git a/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java b/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java index 7e1fc42ad2..059c873ad4 100644 --- a/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java +++ b/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java @@ -24,10 +24,6 @@ import static kubatech.api.Variables.numberFormat; import java.util.List; -import kubatech.loaders.block.BlockProxy; -import kubatech.loaders.block.IProxyTileEntityProvider; -import kubatech.tileentity.TeaStorageTile; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -36,6 +32,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; +import kubatech.loaders.block.BlockProxy; +import kubatech.loaders.block.IProxyTileEntityProvider; +import kubatech.tileentity.TeaStorageTile; + public class TeaStorage extends BlockProxy implements IProxyTileEntityProvider { public TeaStorage() { diff --git a/src/main/java/kubatech/loaders/item/ItemProxy.java b/src/main/java/kubatech/loaders/item/ItemProxy.java index aa7d538790..a8d7124a65 100644 --- a/src/main/java/kubatech/loaders/item/ItemProxy.java +++ b/src/main/java/kubatech/loaders/item/ItemProxy.java @@ -22,8 +22,6 @@ package kubatech.loaders.item; import java.util.List; -import kubatech.Tags; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -41,6 +39,8 @@ import com.gtnewhorizons.modularui.common.builder.UIInfo; import com.gtnewhorizons.modularui.common.internal.wrapper.ModularGui; import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer; +import kubatech.Tags; + public class ItemProxy { private static final UIInfo<?, ?> HeldItemUIInfo = UIBuilder.of() diff --git a/src/main/java/kubatech/loaders/item/KubaItems.java b/src/main/java/kubatech/loaders/item/KubaItems.java index 0b832c8aff..fc306ab064 100644 --- a/src/main/java/kubatech/loaders/item/KubaItems.java +++ b/src/main/java/kubatech/loaders/item/KubaItems.java @@ -25,8 +25,6 @@ import static kubatech.kubatech.KT; import java.util.HashMap; import java.util.List; -import kubatech.loaders.ItemLoader; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -39,6 +37,7 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import kubatech.loaders.ItemLoader; public class KubaItems extends Item { diff --git a/src/main/java/kubatech/loaders/item/items/Tea.java b/src/main/java/kubatech/loaders/item/items/Tea.java index bf989f46ad..7af7eaafb2 100644 --- a/src/main/java/kubatech/loaders/item/items/Tea.java +++ b/src/main/java/kubatech/loaders/item/items/Tea.java @@ -22,13 +22,13 @@ package kubatech.loaders.item.items; import java.util.List; -import kubatech.loaders.item.ItemProxy; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import kubatech.loaders.item.ItemProxy; + public class Tea extends ItemProxy { private final int heal; diff --git a/src/main/java/kubatech/loaders/item/items/TeaCollection.java b/src/main/java/kubatech/loaders/item/items/TeaCollection.java index 8742b482c4..ef3346422a 100644 --- a/src/main/java/kubatech/loaders/item/items/TeaCollection.java +++ b/src/main/java/kubatech/loaders/item/items/TeaCollection.java @@ -24,10 +24,6 @@ import java.util.LinkedList; import java.util.List; import java.util.UUID; -import kubatech.api.utils.ModUtils; -import kubatech.loaders.ItemLoader; -import kubatech.loaders.item.ItemProxy; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -43,6 +39,10 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.AchievementPage; +import kubatech.api.utils.ModUtils; +import kubatech.loaders.ItemLoader; +import kubatech.loaders.item.ItemProxy; + public class TeaCollection extends ItemProxy { protected static TeaPage teapage; diff --git a/src/main/java/kubatech/loaders/item/items/TeaIngredient.java b/src/main/java/kubatech/loaders/item/items/TeaIngredient.java index 82d9b5a5ae..cb4088e925 100644 --- a/src/main/java/kubatech/loaders/item/items/TeaIngredient.java +++ b/src/main/java/kubatech/loaders/item/items/TeaIngredient.java @@ -22,12 +22,12 @@ package kubatech.loaders.item.items; import java.util.List; -import kubatech.loaders.item.ItemProxy; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import kubatech.loaders.item.ItemProxy; + public class TeaIngredient extends ItemProxy { public TeaIngredient(String unlocalizedName) { diff --git a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java b/src/main/java/kubatech/loaders/item/items/TeaUltimate.java index 2ae9b21875..db34f9e105 100644 --- a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java +++ b/src/main/java/kubatech/loaders/item/items/TeaUltimate.java @@ -27,12 +27,6 @@ import java.math.BigInteger; import java.text.NumberFormat; import java.util.concurrent.atomic.AtomicReference; -import kubatech.api.enums.ItemList; -import kubatech.api.tea.TeaNetwork; -import kubatech.api.utils.ModUtils; -import kubatech.api.utils.StringUtils; -import kubatech.loaders.item.IItemProxyGUI; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -43,8 +37,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import codechicken.nei.NEIClientUtils; - import com.gtnewhorizons.modularui.api.ModularUITextures; import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.drawable.ItemDrawable; @@ -54,6 +46,13 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.widget.Widget; import com.gtnewhorizons.modularui.common.widget.*; +import codechicken.nei.NEIClientUtils; +import kubatech.api.enums.ItemList; +import kubatech.api.tea.TeaNetwork; +import kubatech.api.utils.ModUtils; +import kubatech.api.utils.StringUtils; +import kubatech.loaders.item.IItemProxyGUI; + public class TeaUltimate extends TeaCollection implements IItemProxyGUI { public TeaUltimate() { |