diff --git a/build.gradle b/build.gradle index 74899dc9..7bb7e0c9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1682104756 +//version: 1684126044 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -6,29 +6,25 @@ */ -import com.diffplug.blowdryer.Blowdryer -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask +import com.gtnewhorizons.retrofuturagradle.util.Distribution import com.matthewprenger.cursegradle.CurseArtifact import com.matthewprenger.cursegradle.CurseRelation import com.modrinth.minotaur.dependencies.ModDependency import com.modrinth.minotaur.dependencies.VersionDependency -import cpw.mods.fml.relauncher.Side -import org.gradle.api.tasks.options.Option; import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory import org.gradle.internal.xml.XmlTransformer -import org.jetbrains.gradle.ext.* +import org.jetbrains.gradle.ext.Application +import org.jetbrains.gradle.ext.Gradle +import javax.inject.Inject import java.nio.file.Files import java.nio.file.Paths import java.util.concurrent.TimeUnit -import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream -import javax.inject.Inject buildscript { repositories { @@ -66,15 +62,18 @@ plugins { id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle - id 'com.github.johnrengelman.shadow' version '7.1.2' apply false + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false id 'com.palantir.git-version' version '3.0.0' apply false - id 'de.undercouch.download' version '5.3.0' + id 'de.undercouch.download' version '5.4.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle - id 'com.diffplug.spotless' version '6.7.2' apply false + id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.2.7' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.13' } + +print("You might want to check out './gradlew :faq' if your build fails.\n") + boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated if (settingsupdated) @@ -133,7 +132,7 @@ propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new // this is meant to be set using the user wide property file. by default we do nothing. propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea" -project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts +project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts if (!disableSpotless) { apply plugin: 'com.diffplug.spotless' apply from: Blowdryer.file('spotless.gradle') @@ -223,6 +222,8 @@ if (enableModernJavaSyntax.toBoolean()) { dependencies { annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0' compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { transitive = false // We only care about the 1 annotation class } @@ -408,7 +409,7 @@ minecraft { username = developmentEnvironmentUserName.toString() - lwjgl3Version = "3.3.2-SNAPSHOT" + lwjgl3Version = "3.3.2" // Enable assertions in the current mod extraRunJvmArguments.add("-ea:${modGroup}") @@ -568,9 +569,10 @@ repositories { def mixinProviderGroup = "io.github.legacymoddingmc" def mixinProviderModule = "unimixins" -def mixinProviderVersion = "0.1.6" +def mixinProviderVersion = "0.1.7.1" def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" +ext.mixinProviderSpec = mixinProviderSpec dependencies { if (usesMixins.toBoolean()) { @@ -722,13 +724,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.3.3' + def lwjgl3ifyVersion = '1.3.5' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -802,7 +804,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { public boolean setEnableHotswap(boolean enable) { enableHotswap = enable } @Inject - public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) { + public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) { super(side, gradle) this.lwjglVersion = 3 @@ -811,7 +813,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : [])) this.classpath(project.java17PatchDependenciesCfg) - if (side == Side.CLIENT) { + if (side == Distribution.CLIENT) { this.classpath(project.minecraftTasks.lwjgl3Configuration) } // Use a raw provider instead of map to not create a dependency on the task @@ -821,9 +823,21 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { } this.classpath(project.java17DependenciesCfg) } + + public void setup(Project project) { + super.setup(project) + if (project.usesMixins.toBoolean()) { + this.extraJvmArgs.addAll(project.provider(() -> { + def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec)) + mixinCfg.canBeConsumed = false + mixinCfg.transitive = false + enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : [] + })) + } + } } -def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient") +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") runClient17Task.configure { setup(project) group = "Modded Minecraft" @@ -834,7 +848,7 @@ runClient17Task.configure { userUUID = minecraft.userUUID } -def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer") +def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer") runServer17Task.configure { setup(project) group = "Modded Minecraft" @@ -875,11 +889,6 @@ tasks.named("jar", Jar).configure { } if (usesShadowedDependencies.toBoolean()) { - tasks.register('relocateShadowJar', ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = modGroup + ".shadow" - enabled = relocateShadowedDependencies.toBoolean() - } tasks.named("shadowJar", ShadowJar).configure { manifest { attributes(getManifestAttributes()) @@ -895,7 +904,8 @@ if (usesShadowedDependencies.toBoolean()) { ] archiveClassifier.set('dev') if (relocateShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -1228,7 +1238,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.0.2" +def buildscriptGradleVersion = "8.1.1" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion @@ -1260,6 +1270,21 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA } } +// If you want to add more cases to this task, implement them as arguments if total amount to print gets too large +tasks.register('faq') { + group = 'GTNH Buildscript' + description = 'Prints frequently asked questions about building a project' + + doLast { + print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " + + "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" + + "The links can be found in repositories.gradle and build.gradle:repositories, " + + "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" + + "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " + + "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.") + } +} + static URL availableBuildScriptUrl() { new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle") } diff --git a/dependencies.gradle b/dependencies.gradle index a1ae4482..2934268d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,13 +3,13 @@ dependencies { api("com.github.GTNewHorizons:Mantle:0.3.6:dev") api("com.github.GTNewHorizons:ForgeMultipart:1.3.3:dev") - implementation("com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev") + implementation("com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev") + compileOnlyApi("curse.maven:cofh-core-69162:2388751") compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.5.16:api") - compileOnly("com.github.GTNewHorizons:waila:1.5.24:api") + compileOnly("com.github.GTNewHorizons:waila:1.6.0:api") compileOnly("com.github.GTNewHorizons:Battlegear2:1.2.0:api") { transitive = false } - implementation("curse.maven:cofh-core-69162:2388751") compileOnly("curse.maven:minefactory-reloaded-66672:2366150") compileOnly("curse.maven:zelda-sword-skills-220540:2384889") compileOnly("curse.maven:dynamic-sword-skills-226360:2495462") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b..37aef8d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 048644d4..795e74d9 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -3,9 +3,6 @@ package tconstruct; import java.util.Map; import java.util.Random; -import mantle.pulsar.config.ForgeCFG; -import mantle.pulsar.control.PulseManager; - import net.minecraft.entity.item.EntityItem; import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraftforge.common.MinecraftForge; @@ -14,6 +11,21 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +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.*; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.NetworkCheckHandler; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.VillagerRegistry; +import cpw.mods.fml.relauncher.Side; +import mantle.pulsar.config.ForgeCFG; +import mantle.pulsar.control.PulseManager; import tconstruct.achievements.AchievementEvents; import tconstruct.achievements.TAchievements; import tconstruct.api.TConstructAPI; @@ -53,19 +65,6 @@ import tconstruct.weaponry.TinkerWeaponry; import tconstruct.world.TinkerWorld; import tconstruct.world.gen.SlimeIslandGen; import tconstruct.world.village.*; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -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.*; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.NetworkCheckHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; -import cpw.mods.fml.relauncher.Side; /** * TConstruct, the tool mod. Craft your tools with style, then modify until the original is gone! diff --git a/src/main/java/tconstruct/achievements/AchievementEvents.java b/src/main/java/tconstruct/achievements/AchievementEvents.java index d844363c..4db6fc7e 100644 --- a/src/main/java/tconstruct/achievements/AchievementEvents.java +++ b/src/main/java/tconstruct/achievements/AchievementEvents.java @@ -8,14 +8,14 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import com.mojang.realmsclient.gui.ChatFormatting; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.items.tools.FryingPan; import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.tools.*; import tconstruct.tools.logic.ToolForgeLogic; -import com.mojang.realmsclient.gui.ChatFormatting; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - public class AchievementEvents { @SubscribeEvent diff --git a/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java b/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java index 7e9d852a..3070fc26 100644 --- a/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java +++ b/src/main/java/tconstruct/achievements/items/CraftAchievementItem.java @@ -1,12 +1,11 @@ package tconstruct.achievements.items; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import mantle.items.abstracts.CraftingItem; import tconstruct.achievements.TAchievements; public class CraftAchievementItem extends CraftingItem { diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java index aef0dec3..0b011b65 100644 --- a/src/main/java/tconstruct/armor/ArmorAbilities.java +++ b/src/main/java/tconstruct/armor/ArmorAbilities.java @@ -8,14 +8,14 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.TickEvent; import tconstruct.TConstruct; import tconstruct.armor.items.TravelGear; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.modifier.IModifyable; import tconstruct.util.network.HealthUpdatePacket; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.TickEvent; public class ArmorAbilities { diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index 5cfb88d2..0d22e907 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -2,8 +2,6 @@ package tconstruct.armor; import java.util.Random; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.model.ModelBiped; @@ -28,6 +26,10 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import mantle.lib.client.MantleClientRegistry; import tconstruct.armor.gui.ArmorExtendedGui; import tconstruct.armor.gui.KnapsackGui; import tconstruct.armor.items.TravelGear; @@ -49,9 +51,6 @@ import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ArmorProxyClient extends ArmorProxyCommon { diff --git a/src/main/java/tconstruct/armor/ArmorProxyCommon.java b/src/main/java/tconstruct/armor/ArmorProxyCommon.java index f307f34b..9763e2f9 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyCommon.java +++ b/src/main/java/tconstruct/armor/ArmorProxyCommon.java @@ -4,11 +4,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; import tconstruct.TConstruct; import tconstruct.armor.inventory.*; import tconstruct.armor.player.TPlayerStats; import tconstruct.common.TProxyCommon; -import cpw.mods.fml.common.network.IGuiHandler; public class ArmorProxyCommon implements IGuiHandler { diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index 36d47ed9..84a727b2 100644 --- a/src/main/java/tconstruct/armor/TinkerArmor.java +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -2,8 +2,6 @@ package tconstruct.armor; import java.util.EnumSet; -import mantle.pulsar.pulse.*; - import net.minecraft.block.Block; import net.minecraft.init.*; import net.minecraft.item.*; @@ -13,6 +11,11 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.ShapedOreRecipe; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.armor.blocks.DryingRack; import tconstruct.armor.items.*; @@ -26,10 +29,6 @@ import tconstruct.modifiers.armor.*; import tconstruct.modifiers.tools.ModAttack; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Armory", description = "Modifyable armors, such as the traveller's gear.") diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java index a84c1ffa..38edcb2d 100644 --- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java +++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java @@ -13,13 +13,13 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.TConstruct; import tconstruct.armor.items.TravelWings; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.modifier.IModifyable; import tconstruct.util.config.PHConstruct; import tconstruct.util.network.ArmourGuiSyncPacket; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TinkerArmorEvents { diff --git a/src/main/java/tconstruct/armor/blocks/DryingRack.java b/src/main/java/tconstruct/armor/blocks/DryingRack.java index da30d01c..c42fcf10 100644 --- a/src/main/java/tconstruct/armor/blocks/DryingRack.java +++ b/src/main/java/tconstruct/armor/blocks/DryingRack.java @@ -2,8 +2,6 @@ package tconstruct.armor.blocks; import java.util.List; -import mantle.blocks.abstracts.InventoryBlock; - import net.minecraft.block.material.Material; import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; @@ -13,12 +11,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.armor.modelblock.DryingRackRender; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; -import cpw.mods.fml.relauncher.*; public class DryingRack extends InventoryBlock { diff --git a/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java b/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java index 50978a3d..4c470742 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOpaqueBlocksOnly.java @@ -1,11 +1,11 @@ package tconstruct.armor.inventory; -import mantle.blocks.BlockUtils; - import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import mantle.blocks.BlockUtils; + /** * * @author fuj1n diff --git a/src/main/java/tconstruct/armor/items/ArmorPattern.java b/src/main/java/tconstruct/armor/items/ArmorPattern.java index f3ec8e71..b5704949 100644 --- a/src/main/java/tconstruct/armor/items/ArmorPattern.java +++ b/src/main/java/tconstruct/armor/items/ArmorPattern.java @@ -2,15 +2,14 @@ package tconstruct.armor.items; import java.util.List; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; -import tconstruct.library.*; import cpw.mods.fml.relauncher.*; +import mantle.items.abstracts.CraftingItem; +import tconstruct.library.*; public class ArmorPattern extends CraftingItem implements ItemBlocklike { diff --git a/src/main/java/tconstruct/armor/items/HeartCanister.java b/src/main/java/tconstruct/armor/items/HeartCanister.java index f43ab4da..594e9155 100644 --- a/src/main/java/tconstruct/armor/items/HeartCanister.java +++ b/src/main/java/tconstruct/armor/items/HeartCanister.java @@ -2,17 +2,16 @@ package tconstruct.armor.items; import java.util.List; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; +import mantle.items.abstracts.CraftingItem; import tconstruct.armor.player.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IHealthAccessory; -import cpw.mods.fml.relauncher.*; public class HeartCanister extends CraftingItem implements IHealthAccessory { diff --git a/src/main/java/tconstruct/armor/items/Jerky.java b/src/main/java/tconstruct/armor/items/Jerky.java index 6f9603d6..795a3dbc 100644 --- a/src/main/java/tconstruct/armor/items/Jerky.java +++ b/src/main/java/tconstruct/armor/items/Jerky.java @@ -9,8 +9,8 @@ import net.minecraft.potion.*; import net.minecraft.util.*; import net.minecraft.world.World; -import tconstruct.world.items.SpecialFood; import cpw.mods.fml.relauncher.*; +import tconstruct.world.items.SpecialFood; public class Jerky extends SpecialFood { diff --git a/src/main/java/tconstruct/armor/items/Knapsack.java b/src/main/java/tconstruct/armor/items/Knapsack.java index c1b9ec7f..dce40dc6 100644 --- a/src/main/java/tconstruct/armor/items/Knapsack.java +++ b/src/main/java/tconstruct/armor/items/Knapsack.java @@ -2,15 +2,14 @@ package tconstruct.armor.items; import java.util.List; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.*; +import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IAccessory; -import cpw.mods.fml.relauncher.*; public class Knapsack extends CraftingItem implements IAccessory { diff --git a/src/main/java/tconstruct/armor/items/TravelBelt.java b/src/main/java/tconstruct/armor/items/TravelBelt.java index 3ea1d2df..b4ff6ff6 100644 --- a/src/main/java/tconstruct/armor/items/TravelBelt.java +++ b/src/main/java/tconstruct/armor/items/TravelBelt.java @@ -11,10 +11,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.*; import tconstruct.armor.ArmorProxyClient; import tconstruct.client.ArmorControls; import tconstruct.library.accessory.*; -import cpw.mods.fml.relauncher.*; public class TravelBelt extends AccessoryCore implements IAccessoryModel { diff --git a/src/main/java/tconstruct/armor/items/TravelGear.java b/src/main/java/tconstruct/armor/items/TravelGear.java index 42625d7a..290853ae 100644 --- a/src/main/java/tconstruct/armor/items/TravelGear.java +++ b/src/main/java/tconstruct/armor/items/TravelGear.java @@ -13,13 +13,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.*; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.TinkerArmor; import tconstruct.library.armor.*; import thaumcraft.api.IGoggles; import thaumcraft.api.nodes.IRevealer; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer"), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles") }) diff --git a/src/main/java/tconstruct/armor/items/TravelGlove.java b/src/main/java/tconstruct/armor/items/TravelGlove.java index ab83e5a6..0eb54730 100644 --- a/src/main/java/tconstruct/armor/items/TravelGlove.java +++ b/src/main/java/tconstruct/armor/items/TravelGlove.java @@ -6,9 +6,9 @@ import net.minecraft.entity.*; import net.minecraft.item.ItemStack; import net.minecraft.util.*; +import cpw.mods.fml.relauncher.*; import tconstruct.armor.ArmorProxyClient; import tconstruct.library.accessory.*; -import cpw.mods.fml.relauncher.*; public class TravelGlove extends AccessoryCore implements IAccessoryModel { diff --git a/src/main/java/tconstruct/armor/items/TravelWings.java b/src/main/java/tconstruct/armor/items/TravelWings.java index 1525e4b6..02edb875 100644 --- a/src/main/java/tconstruct/armor/items/TravelWings.java +++ b/src/main/java/tconstruct/armor/items/TravelWings.java @@ -8,10 +8,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import tconstruct.library.armor.ArmorPart; -import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.library.armor.ArmorPart; +import tconstruct.tools.TinkerTools; public class TravelWings extends TravelGear { diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java index 1fc6a030..67ce0908 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java @@ -6,8 +6,8 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import tconstruct.util.ItemHelper; import cpw.mods.fml.client.registry.*; +import tconstruct.util.ItemHelper; public class DryingRackRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java index 8116a010..2e99ce0d 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.*; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.tools.entity.FancyEntityItem; -import cpw.mods.fml.relauncher.*; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java index b5ad415b..501a34b4 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtended.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtended.java @@ -13,12 +13,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import tconstruct.library.accessory.IHealthAccessory; -import tconstruct.util.config.PHConstruct; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; +import tconstruct.library.accessory.IHealthAccessory; +import tconstruct.util.config.PHConstruct; public class ArmorExtended implements IInventory { diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index 04415a4c..f317e1f7 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -5,8 +5,6 @@ import java.net.*; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import mantle.player.PlayerUtils; - import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.*; import net.minecraft.entity.Entity.EnumEntitySize; @@ -18,15 +16,16 @@ import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.PlayerDropsEvent; -import tconstruct.TConstruct; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.tools.TinkerTools; -import tconstruct.util.config.PHConstruct; import cpw.mods.fml.common.*; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; import cpw.mods.fml.relauncher.Side; +import mantle.player.PlayerUtils; +import tconstruct.TConstruct; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.tools.TinkerTools; +import tconstruct.util.config.PHConstruct; // TODO: Redesign this class public class TPlayerHandler { diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index 13e3fc64..02e64efb 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -2,8 +2,6 @@ package tconstruct.blocks; import java.util.List; -import mantle.blocks.MantleBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,8 +11,9 @@ import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.*; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; +import tconstruct.library.TConstructRegistry; public class SlabBase extends MantleBlock { diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index 24eae56b..dbfecd57 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -2,16 +2,15 @@ package tconstruct.blocks; import java.util.List; -import mantle.blocks.MantleBlock; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; +import tconstruct.library.TConstructRegistry; public class TConstructBlock extends MantleBlock { diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 985d48d7..9ff0177e 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -1,7 +1,5 @@ package tconstruct.blocks.logic; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; @@ -11,8 +9,9 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import tconstruct.library.crafting.DryingRackRecipes; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventoryLogic; +import tconstruct.library.crafting.DryingRackRecipes; public class DryingRackLogic extends InventoryLogic { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index b3dc8195..8d0a4aaf 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -9,11 +9,11 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.*; +import cpw.mods.fml.relauncher.*; import tconstruct.world.TinkerWorld; import tconstruct.world.entity.BlueSlime; import tconstruct.world.entity.KingBlueSlime; import tconstruct.world.entity.SlimeBase; -import cpw.mods.fml.relauncher.*; public class SlimeFluid extends BlockFluidClassic { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 7bedbdcf..53673ea2 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -11,9 +11,9 @@ import net.minecraft.potion.*; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; import tconstruct.blocks.TConstructBlock; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.relauncher.*; public class SlimeGel extends TConstructBlock { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index fe037e78..e7c5bf35 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -2,8 +2,6 @@ package tconstruct.blocks.slime; import java.util.*; -import mantle.blocks.MantleBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,9 +13,10 @@ import net.minecraft.world.*; import net.minecraftforge.common.*; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.*; public class SlimeGrass extends MantleBlock { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 2246b648..7d64ef9d 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -10,9 +10,9 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.*; public class SlimeLeaves extends BlockLeaves { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 1045e8d2..9e77f576 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -12,11 +12,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; import tconstruct.world.gen.SlimeTreeGen; -import cpw.mods.fml.relauncher.*; public class SlimeSapling extends BlockSapling { diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index c0fa2703..eead0105 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -12,8 +12,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.*; import net.minecraftforge.common.*; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.*; +import tconstruct.library.TConstructRegistry; public class SlimeTallGrass extends BlockBush implements IShearable { diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index b7d46ac1..1f318400 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -1,7 +1,5 @@ package tconstruct.blocks.traps; -import mantle.blocks.MantleBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,9 +9,10 @@ import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.world.model.BarricadeRender; -import cpw.mods.fml.relauncher.*; public class BarricadeBlock extends MantleBlock { diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index cb4bf490..9a787b09 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -3,9 +3,6 @@ package tconstruct.blocks.traps; import java.util.List; import java.util.Random; -import mantle.blocks.MantleBlock; -import mantle.world.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; @@ -19,9 +16,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mantle.blocks.MantleBlock; +import mantle.world.WorldHelper; +import tconstruct.library.TConstructRegistry; public class Landmine extends MantleBlock { diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 8905a487..1eb0d9a1 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -2,8 +2,6 @@ package tconstruct.blocks.traps; import java.util.Random; -import mantle.blocks.MantleBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,10 +12,11 @@ import net.minecraft.potion.*; import net.minecraft.util.DamageSource; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; import tconstruct.world.model.PunjiRender; -import cpw.mods.fml.relauncher.*; public class Punji extends MantleBlock { diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java index b2d54d18..d4bee6e4 100644 --- a/src/main/java/tconstruct/client/ArmorControls.java +++ b/src/main/java/tconstruct/client/ArmorControls.java @@ -1,9 +1,5 @@ package tconstruct.client; -import mantle.common.network.AbstractPacket; -import modwarriors.notenoughkeys.api.Api; -import modwarriors.notenoughkeys.api.KeyBindingPressedEvent; - import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; @@ -12,6 +8,14 @@ import net.minecraft.potion.Potion; import org.lwjgl.input.Keyboard; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; +import mantle.common.network.AbstractPacket; +import modwarriors.notenoughkeys.api.Api; +import modwarriors.notenoughkeys.api.KeyBindingPressedEvent; import tconstruct.TConstruct; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.ArmorProxyCommon; @@ -21,11 +25,6 @@ import tconstruct.util.network.AccessoryInventoryPacket; import tconstruct.util.network.BeltPacket; import tconstruct.util.network.DoubleJumpPacket; import tconstruct.util.network.GogglePacket; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; public class ArmorControls { diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 8a7f2606..3d365fa0 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -5,9 +5,6 @@ import java.text.DecimalFormat; import javax.xml.parsers.*; -import mantle.client.SmallFontRenderer; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.*; @@ -16,6 +13,8 @@ import net.minecraft.util.*; import org.w3c.dom.Document; +import mantle.client.SmallFontRenderer; +import mantle.lib.client.MantleClientRegistry; import tconstruct.TConstruct; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.player.TPlayerStats; diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index aef3c985..a76b92d7 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -9,9 +9,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.*; import tconstruct.mechworks.entity.item.ExplosivePrimed; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class ExplosiveRender extends Render { diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index db1fe7ee..16c7bb99 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -2,8 +2,6 @@ package tconstruct.client.entity.projectile; import java.util.Random; -import mantle.blocks.BlockUtils; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; @@ -15,8 +13,9 @@ import net.minecraft.util.*; import org.lwjgl.opengl.*; -import tconstruct.tools.entity.ArrowEntity; import cpw.mods.fml.relauncher.*; +import mantle.blocks.BlockUtils; +import tconstruct.tools.entity.ArrowEntity; @SideOnly(Side.CLIENT) @Deprecated diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java index 57a9d6e7..8c5fdb17 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -12,8 +12,8 @@ import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.*; -import tconstruct.tools.entity.ArrowEntity; import cpw.mods.fml.relauncher.*; +import tconstruct.tools.entity.ArrowEntity; @SideOnly(Side.CLIENT) @Deprecated diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index 4672597c..4ac2321b 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -2,8 +2,6 @@ package tconstruct.client.entity.projectile; import java.util.Random; -import mantle.blocks.BlockUtils; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -17,8 +15,9 @@ import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.*; -import tconstruct.tools.entity.DaggerEntity; import cpw.mods.fml.relauncher.*; +import mantle.blocks.BlockUtils; +import tconstruct.tools.entity.DaggerEntity; @SideOnly(Side.CLIENT) @Deprecated diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java index e6b57a76..40c81906 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -12,9 +12,9 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.*; +import cpw.mods.fml.relauncher.*; import tconstruct.client.ToolCoreRenderer; import tconstruct.tools.entity.DaggerEntity; -import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) @Deprecated diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index 769b7ab4..0dfa84cd 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -10,8 +10,8 @@ import net.minecraft.util.*; import org.lwjgl.opengl.*; -import tconstruct.tools.entity.LaunchedPotion; import cpw.mods.fml.relauncher.*; +import tconstruct.tools.entity.LaunchedPotion; @SideOnly(Side.CLIENT) public class LaunchedItemRender extends Render { diff --git a/src/main/java/tconstruct/client/pages/BlockCastPage.java b/src/main/java/tconstruct/client/pages/BlockCastPage.java index 725e7fcd..76e7e258 100644 --- a/src/main/java/tconstruct/client/pages/BlockCastPage.java +++ b/src/main/java/tconstruct/client/pages/BlockCastPage.java @@ -1,8 +1,5 @@ package tconstruct.client.pages; -import mantle.client.pages.BookPage; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.*; @@ -10,6 +7,9 @@ import net.minecraft.util.*; import org.lwjgl.opengl.*; import org.w3c.dom.*; +import mantle.client.pages.BookPage; +import mantle.lib.client.MantleClientRegistry; + public class BlockCastPage extends BookPage { String text; diff --git a/src/main/java/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java index 8f251caa..631b8549 100644 --- a/src/main/java/tconstruct/client/pages/MaterialPage.java +++ b/src/main/java/tconstruct/client/pages/MaterialPage.java @@ -1,8 +1,5 @@ package tconstruct.client.pages; -import mantle.client.pages.BookPage; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -10,6 +7,8 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.*; import org.w3c.dom.*; +import mantle.client.pages.BookPage; +import mantle.lib.client.MantleClientRegistry; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.tools.ToolMaterial; diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 74f40292..4f1505ff 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -2,9 +2,6 @@ package tconstruct.client.pages; import java.util.*; -import mantle.client.pages.BookPage; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.*; @@ -12,6 +9,9 @@ import net.minecraft.util.*; import org.lwjgl.opengl.*; import org.w3c.dom.*; +import mantle.client.pages.BookPage; +import mantle.lib.client.MantleClientRegistry; + public class ModifierPage extends BookPage { String type; diff --git a/src/main/java/tconstruct/client/pages/ToolPage.java b/src/main/java/tconstruct/client/pages/ToolPage.java index a3764580..a701d80e 100644 --- a/src/main/java/tconstruct/client/pages/ToolPage.java +++ b/src/main/java/tconstruct/client/pages/ToolPage.java @@ -1,8 +1,5 @@ package tconstruct.client.pages; -import mantle.client.pages.BookPage; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -10,6 +7,9 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.*; import org.w3c.dom.*; +import mantle.client.pages.BookPage; +import mantle.lib.client.MantleClientRegistry; + public class ToolPage extends BookPage { String title; diff --git a/src/main/java/tconstruct/gadgets/TinkerGadgets.java b/src/main/java/tconstruct/gadgets/TinkerGadgets.java index 67277ca8..b0fe31bb 100644 --- a/src/main/java/tconstruct/gadgets/TinkerGadgets.java +++ b/src/main/java/tconstruct/gadgets/TinkerGadgets.java @@ -2,9 +2,6 @@ package tconstruct.gadgets; import java.util.Locale; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; - import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -14,15 +11,17 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +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.registry.GameRegistry; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.gadgets.item.ItemSlimeBoots; import tconstruct.gadgets.item.ItemSlimeSling; import tconstruct.library.SlimeBounceHandler; import tconstruct.library.TConstructRegistry; -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.registry.GameRegistry; @Pulse(id = "Tinkers' Gadgets", description = "All the fun toys.", forced = true) public class TinkerGadgets { diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java index b76f8d12..50578187 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeBoots.java @@ -23,13 +23,13 @@ import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.event.entity.living.LivingFallEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tconstruct.library.SlimeBounceHandler; import tconstruct.library.TConstructRegistry; import tconstruct.library.armor.ArmorPart; import tconstruct.tools.entity.FancyEntityItem; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemSlimeBoots extends ItemArmor implements ISpecialArmor { diff --git a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java index 8ae2ec8d..0b3ff8fe 100644 --- a/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java +++ b/src/main/java/tconstruct/gadgets/item/ItemSlimeSling.java @@ -15,13 +15,13 @@ import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tconstruct.TConstruct; import tconstruct.gadgets.TinkerGadgets; import tconstruct.library.SlimeBounceHandler; import tconstruct.library.TConstructRegistry; import tconstruct.util.network.MovementUpdatePacket; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemSlimeSling extends Item { diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 05f11a4d..a5e56a6f 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -9,13 +9,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.ToolCore; import tconstruct.weaponry.TinkerWeaponry; -import cpw.mods.fml.relauncher.*; @Deprecated public class Arrow extends ToolCore { diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java index ead427e4..746e23a3 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -4,12 +4,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.*; import tconstruct.TConstruct; import tconstruct.library.tools.Weapon; import tconstruct.tools.*; import tconstruct.tools.logic.EquipLogic; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.*; public class BattleSign extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index 205ea299..947c17bd 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -1,8 +1,5 @@ package tconstruct.items.tools; -import mods.battlegear2.api.PlayerEventChild; -import mods.battlegear2.api.weapons.IBattlegearWeapon; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.entity.EntityPlayerSP; @@ -18,12 +15,14 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import tconstruct.library.tools.AOEHarvestTool; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.tools.TinkerTools; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mods.battlegear2.api.PlayerEventChild; +import mods.battlegear2.api.weapons.IBattlegearWeapon; +import tconstruct.library.tools.AOEHarvestTool; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.tools.TinkerTools; @Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"), diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index 61ff321f..1c94ffbc 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -10,11 +10,11 @@ import net.minecraft.util.*; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; import tconstruct.TConstruct; import tconstruct.library.crafting.Detailing.DetailInput; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.*; public class Chisel extends ToolCore { diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index 4be19a0e..2bfbd530 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -7,9 +7,9 @@ import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.*; public class Longsword extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index afd42a2a..87e9ab77 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -4,8 +4,6 @@ import java.util.Queue; import java.util.Set; import java.util.Stack; -import mantle.player.PlayerUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -15,10 +13,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; -import tconstruct.library.*; -import tconstruct.library.tools.*; -import tconstruct.tools.TinkerTools; - import com.google.common.collect.Lists; import cpw.mods.fml.common.FMLCommonHandler; @@ -26,6 +20,10 @@ import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import gnu.trove.set.hash.THashSet; +import mantle.player.PlayerUtils; +import tconstruct.library.*; +import tconstruct.library.tools.*; +import tconstruct.tools.TinkerTools; public class LumberAxe extends AOEHarvestTool { diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index 0d7d9582..012dfbc3 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -12,8 +12,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; -import tconstruct.tools.entity.LaunchedPotion; import cpw.mods.fml.relauncher.*; +import tconstruct.tools.entity.LaunchedPotion; public class PotionLauncher extends Item { diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index bed8af70..8ba7b81c 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -19,10 +19,10 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; +import cpw.mods.fml.client.FMLClientHandler; import tconstruct.library.*; import tconstruct.library.tools.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.client.FMLClientHandler; public class Scythe extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index b443a051..3bbe2574 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -10,12 +10,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.BowstringMaterial; import tconstruct.library.tools.CustomMaterial; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; -import cpw.mods.fml.relauncher.*; @Deprecated public class Shortbow extends BowBase { diff --git a/src/main/java/tconstruct/library/SlimeBounceHandler.java b/src/main/java/tconstruct/library/SlimeBounceHandler.java index 78aaa7bd..8be35d91 100644 --- a/src/main/java/tconstruct/library/SlimeBounceHandler.java +++ b/src/main/java/tconstruct/library/SlimeBounceHandler.java @@ -9,10 +9,10 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import tconstruct.gadgets.TinkerGadgets; -import tconstruct.gadgets.item.ItemSlimeBoots; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import tconstruct.gadgets.TinkerGadgets; +import tconstruct.gadgets.item.ItemSlimeBoots; /** Logic for entities bouncing */ public class SlimeBounceHandler { diff --git a/src/main/java/tconstruct/library/accessory/AccessoryCore.java b/src/main/java/tconstruct/library/accessory/AccessoryCore.java index 5d1ab51d..96bb6ff5 100644 --- a/src/main/java/tconstruct/library/accessory/AccessoryCore.java +++ b/src/main/java/tconstruct/library/accessory/AccessoryCore.java @@ -9,10 +9,10 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.relauncher.*; public abstract class AccessoryCore extends Item implements IAccessory, IModifyable { diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index 7009062f..ff3a6853 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -15,11 +15,11 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.modifier.*; import tconstruct.library.tools.ToolCore; import tconstruct.tools.entity.FancyEntityItem; -import cpw.mods.fml.relauncher.*; public abstract class ArmorCore extends ItemArmor implements ISpecialArmor, IModifyable { diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java index 941da55c..0ac4dfab 100644 --- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java +++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java @@ -2,11 +2,10 @@ package tconstruct.library.client; import java.util.*; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import mantle.lib.client.MantleClientRegistry; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.tools.ToolCore; diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index c8c3cf02..7db78666 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -2,13 +2,12 @@ package tconstruct.library.component; import java.util.*; -import mantle.blocks.iface.*; -import mantle.world.*; - import net.minecraft.block.Block; import net.minecraft.nbt.*; import net.minecraft.tileentity.TileEntity; +import mantle.blocks.iface.*; +import mantle.world.*; import tconstruct.TConstruct; public class TankLayerScan extends LogicComponent { diff --git a/src/main/java/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java index 7114a5ad..8fe0c436 100644 --- a/src/main/java/tconstruct/library/crafting/Detailing.java +++ b/src/main/java/tconstruct/library/crafting/Detailing.java @@ -6,8 +6,8 @@ import net.minecraft.block.Block; import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.tools.ToolCore; import cpw.mods.fml.common.registry.GameRegistry; +import tconstruct.library.tools.ToolCore; public class Detailing { diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index 83a62ae6..2e673457 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -7,11 +7,11 @@ import net.minecraft.block.Block; import net.minecraft.item.*; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.eventhandler.Event.Result; import tconstruct.library.TConstructRegistry; import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.util.IPattern; -import cpw.mods.fml.common.eventhandler.Event.Result; public class PatternBuilder { diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index aaf4ded5..6a4da14f 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -2,13 +2,13 @@ package tconstruct.library.crafting; import java.util.*; -import mantle.utils.ItemMetaWrapper; - import net.minecraft.block.Block; import net.minecraft.item.*; import net.minecraftforge.fluids.*; import net.minecraftforge.oredict.OreDictionary; +import mantle.utils.ItemMetaWrapper; + /** Melting and hacking, churn and burn */ public class Smeltery { diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index fe64a635..ac4ee162 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -8,12 +8,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.eventhandler.Event.Result; import tconstruct.library.TConstructRegistry; import tconstruct.library.event.*; import tconstruct.library.modifier.ItemModifier; import tconstruct.library.tools.*; import tconstruct.library.util.IToolPart; -import cpw.mods.fml.common.eventhandler.Event.Result; public class ToolBuilder { diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java index 2a362ce2..84216c72 100644 --- a/src/main/java/tconstruct/library/entity/ProjectileBase.java +++ b/src/main/java/tconstruct/library/entity/ProjectileBase.java @@ -17,6 +17,9 @@ import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.*; import net.minecraft.world.World; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import io.netty.buffer.ByteBuf; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; @@ -24,9 +27,6 @@ import tconstruct.library.tools.ToolCore; import tconstruct.library.weaponry.AmmoItem; import tconstruct.util.Reference; import tconstruct.weaponry.entity.ArrowEntity; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import io.netty.buffer.ByteBuf; // have to base this on EntityArrow, otherwise minecraft does derp things because everything is handled based on class. public abstract class ProjectileBase extends EntityArrow implements IEntityAdditionalSpawnData { diff --git a/src/main/java/tconstruct/library/event/ModifyEvent.java b/src/main/java/tconstruct/library/event/ModifyEvent.java index fb646d4c..b3ba66b0 100644 --- a/src/main/java/tconstruct/library/event/ModifyEvent.java +++ b/src/main/java/tconstruct/library/event/ModifyEvent.java @@ -2,10 +2,10 @@ package tconstruct.library.event; import net.minecraft.item.ItemStack; -import tconstruct.library.modifier.IModifyable; -import tconstruct.library.modifier.ItemModifier; import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; +import tconstruct.library.modifier.IModifyable; +import tconstruct.library.modifier.ItemModifier; @Cancelable public class ModifyEvent extends Event { diff --git a/src/main/java/tconstruct/library/event/SmelteryCastEvent.java b/src/main/java/tconstruct/library/event/SmelteryCastEvent.java index 6cb2d882..ee64594c 100644 --- a/src/main/java/tconstruct/library/event/SmelteryCastEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryCastEvent.java @@ -2,8 +2,8 @@ package tconstruct.library.event; import net.minecraftforge.fluids.FluidStack; -import tconstruct.library.crafting.CastingRecipe; import cpw.mods.fml.common.eventhandler.Event; +import tconstruct.library.crafting.CastingRecipe; /** * Fires when somebody tries to pour a liquid into a metal cast. diff --git a/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java b/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java index acb2d42e..151768de 100644 --- a/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryCastedEvent.java @@ -2,8 +2,8 @@ package tconstruct.library.event; import net.minecraft.item.ItemStack; -import tconstruct.library.crafting.CastingRecipe; import cpw.mods.fml.common.eventhandler.Event; +import tconstruct.library.crafting.CastingRecipe; /** * Fired when an item is cast in the casting table. If consumeCast is set to true, the cast will be destroyed. diff --git a/src/main/java/tconstruct/library/event/SmelteryEvent.java b/src/main/java/tconstruct/library/event/SmelteryEvent.java index 33ab39a0..941984ea 100644 --- a/src/main/java/tconstruct/library/event/SmelteryEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryEvent.java @@ -1,12 +1,11 @@ package tconstruct.library.event; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; +import mantle.blocks.abstracts.InventoryLogic; public class SmelteryEvent extends Event { diff --git a/src/main/java/tconstruct/library/event/ToolCraftEvent.java b/src/main/java/tconstruct/library/event/ToolCraftEvent.java index 811d1187..b3e0acc5 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftEvent.java @@ -3,8 +3,8 @@ package tconstruct.library.event; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.tools.*; import cpw.mods.fml.common.eventhandler.Event; +import tconstruct.library.tools.*; /* * This event fires after all of the other construction. The resulting nbttag is added to the tool Note: The tag is the diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 3820cc7f..bc3522ff 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -26,13 +26,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.UseHoeEvent; +import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.Event.Result; import tconstruct.TConstruct; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.PiercingEntityDamage; -import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.Event.Result; public class AbilityHelper { diff --git a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java index fc41849b..8db7ba52 100644 --- a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java +++ b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java @@ -10,12 +10,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.TextureHelper; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class DualMaterialToolPart extends DynamicToolPart { diff --git a/src/main/java/tconstruct/library/tools/DynamicToolPart.java b/src/main/java/tconstruct/library/tools/DynamicToolPart.java index 72971d49..a4c6eb30 100644 --- a/src/main/java/tconstruct/library/tools/DynamicToolPart.java +++ b/src/main/java/tconstruct/library/tools/DynamicToolPart.java @@ -4,8 +4,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -13,12 +11,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.library.util.TextureHelper; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class DynamicToolPart extends CraftingItem implements IToolPart { diff --git a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java index bca70305..83970ba5 100644 --- a/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java +++ b/src/main/java/tconstruct/library/tools/FletchlingLeafMaterial.java @@ -1,10 +1,10 @@ package tconstruct.library.tools; -import mantle.blocks.BlockUtils; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import mantle.blocks.BlockUtils; + public class FletchlingLeafMaterial extends FletchingMaterial { public FletchlingLeafMaterial(int materialID, int value, String oredict, ItemStack craftingItem, float accuracy, diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 0761082f..593698be 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -12,6 +12,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; +import cofh.api.energy.IEnergyContainerItem; +import cofh.core.item.IEqualityOverrideItem; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.*; import tconstruct.library.*; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.*; @@ -20,10 +24,6 @@ import tconstruct.tools.TinkerTools; import tconstruct.tools.entity.FancyEntityItem; import tconstruct.util.config.PHConstruct; import tconstruct.weaponry.TinkerWeaponry; -import cofh.api.energy.IEnergyContainerItem; -import cofh.core.item.IEqualityOverrideItem; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; /** * NBTTags Main tag - InfiTool diff --git a/src/main/java/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java index b1f63209..3bb521df 100644 --- a/src/main/java/tconstruct/library/tools/Weapon.java +++ b/src/main/java/tconstruct/library/tools/Weapon.java @@ -1,8 +1,5 @@ package tconstruct.library.tools; -import mods.battlegear2.api.PlayerEventChild; -import mods.battlegear2.api.weapons.IBattlegearWeapon; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.entity.EntityPlayerSP; @@ -12,9 +9,11 @@ import net.minecraft.item.*; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import tconstruct.tools.TinkerTools; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.*; +import mods.battlegear2.api.PlayerEventChild; +import mods.battlegear2.api.weapons.IBattlegearWeapon; +import tconstruct.tools.TinkerTools; @Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon"), diff --git a/src/main/java/tconstruct/library/weaponry/AmmoItem.java b/src/main/java/tconstruct/library/weaponry/AmmoItem.java index 91facc8a..94c5df08 100644 --- a/src/main/java/tconstruct/library/weaponry/AmmoItem.java +++ b/src/main/java/tconstruct/library/weaponry/AmmoItem.java @@ -1,19 +1,18 @@ package tconstruct.library.weaponry; -import mods.battlegear2.api.PlayerEventChild; -import mods.battlegear2.api.weapons.IBattlegearWeapon; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import mods.battlegear2.api.PlayerEventChild; +import mods.battlegear2.api.weapons.IBattlegearWeapon; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; @Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") }) diff --git a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java index 5b0efbaa..7267616c 100644 --- a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java @@ -1,8 +1,5 @@ package tconstruct.library.weaponry; -import mods.battlegear2.api.PlayerEventChild; -import mods.battlegear2.api.weapons.IBattlegearWeapon; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -10,11 +7,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import tconstruct.tools.TinkerTools; -import tconstruct.weaponry.client.CrosshairType; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mods.battlegear2.api.PlayerEventChild; +import mods.battlegear2.api.weapons.IBattlegearWeapon; +import tconstruct.tools.TinkerTools; +import tconstruct.weaponry.client.CrosshairType; @Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") }) diff --git a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java index 27b545ab..20ea7d45 100644 --- a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java +++ b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java @@ -2,8 +2,6 @@ package tconstruct.library.weaponry; import java.util.List; -import mods.battlegear2.api.core.InventoryPlayerBattle; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -14,13 +12,14 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.common.Loader; +import mods.battlegear2.api.core.InventoryPlayerBattle; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.BowstringMaterial; import tconstruct.library.tools.CustomMaterial; import tconstruct.weaponry.ammo.ArrowAmmo; import tconstruct.weaponry.entity.ArrowEntity; -import cpw.mods.fml.common.Loader; public abstract class BowBaseAmmo extends ProjectileWeapon { diff --git a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java index a55e43a2..c27aa4ee 100644 --- a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java @@ -4,9 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import mods.battlegear2.api.PlayerEventChild; -import mods.battlegear2.api.weapons.IBattlegearWeapon; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -21,6 +18,11 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mods.battlegear2.api.PlayerEventChild; +import mods.battlegear2.api.weapons.IBattlegearWeapon; import tconstruct.client.TProxyClient; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; @@ -29,9 +31,6 @@ import tconstruct.library.util.TextureHelper; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.client.CrosshairType; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @Optional.InterfaceList({ @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon") }) diff --git a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java index e9ff05f3..962b6d31 100644 --- a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java +++ b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java @@ -5,13 +5,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.world.World; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.client.entity.item.ExplosiveRender; import tconstruct.common.TProxyCommon; import tconstruct.mechworks.entity.item.*; import tconstruct.mechworks.gui.GuiLandmine; import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; -import cpw.mods.fml.client.registry.RenderingRegistry; public class MechworksProxyClient extends MechworksProxyCommon { diff --git a/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java b/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java index 0e1c392f..15397dd5 100644 --- a/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java +++ b/src/main/java/tconstruct/mechworks/MechworksProxyCommon.java @@ -3,10 +3,10 @@ package tconstruct.mechworks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; import tconstruct.common.TProxyCommon; import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; -import cpw.mods.fml.common.network.IGuiHandler; public class MechworksProxyCommon implements IGuiHandler { diff --git a/src/main/java/tconstruct/mechworks/TinkerMechworks.java b/src/main/java/tconstruct/mechworks/TinkerMechworks.java index 0d08cf0f..67357fde 100644 --- a/src/main/java/tconstruct/mechworks/TinkerMechworks.java +++ b/src/main/java/tconstruct/mechworks/TinkerMechworks.java @@ -1,23 +1,22 @@ package tconstruct.mechworks; -import mantle.pulsar.pulse.*; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.*; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.mechworks.blocks.BlockLandmine; import tconstruct.mechworks.entity.item.*; import tconstruct.mechworks.itemblocks.ItemBlockLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) // TODO handle migration of all items/blocks that were owned by the previously seperate mod diff --git a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index e09b1673..e52c05d4 100644 --- a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -5,9 +5,6 @@ import static net.minecraftforge.common.util.ForgeDirection.*; import java.util.List; import java.util.Random; -import mantle.blocks.BlockUtils; -import mantle.world.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockPressurePlate.Sensitivity; @@ -32,14 +29,16 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mantle.blocks.BlockUtils; +import mantle.world.WorldHelper; import tconstruct.TConstruct; import tconstruct.mechworks.MechworksProxyCommon; import tconstruct.mechworks.landmine.Helper; import tconstruct.mechworks.logic.LandmineExplodeLogic; import tconstruct.mechworks.logic.TileEntityLandmine; import tconstruct.world.model.RenderLandmine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * diff --git a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java index 63f41edf..6018a3d3 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java @@ -6,8 +6,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tconstruct.util.DamageSourceFireworkExplode; import cpw.mods.fml.relauncher.*; +import tconstruct.util.DamageSourceFireworkExplode; public class EntityLandmineFirework extends Entity { diff --git a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java index d7066235..d043cfe9 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java +++ b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java @@ -5,8 +5,8 @@ import net.minecraft.entity.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.*; -import tconstruct.world.MiningExplosion; import cpw.mods.fml.relauncher.*; +import tconstruct.world.MiningExplosion; public class ExplosivePrimed extends Entity { diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java index aba37a30..349d9c81 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorBlockThrow.java @@ -1,12 +1,12 @@ package tconstruct.mechworks.landmine.behavior; -import mantle.blocks.BlockUtils; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import mantle.blocks.BlockUtils; + /** * * @author fuj1n diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java index 98acd299..d4381250 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java @@ -2,12 +2,11 @@ package tconstruct.mechworks.logic; import java.util.*; -import mantle.world.WorldHelper; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import mantle.world.WorldHelper; import tconstruct.mechworks.landmine.behavior.Behavior; /** diff --git a/src/main/java/tconstruct/mechworks/model/CartRender.java b/src/main/java/tconstruct/mechworks/model/CartRender.java index 8cd9c5d8..075bb5c6 100644 --- a/src/main/java/tconstruct/mechworks/model/CartRender.java +++ b/src/main/java/tconstruct/mechworks/model/CartRender.java @@ -9,8 +9,8 @@ import net.minecraft.util.*; import org.lwjgl.opengl.GL11; -import tconstruct.world.entity.CartEntity; import cpw.mods.fml.relauncher.*; +import tconstruct.world.entity.CartEntity; @SideOnly(Side.CLIENT) public class CartRender extends Render { diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index e7014399..83733f8b 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -5,10 +5,10 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import cofh.api.energy.IEnergyContainerItem; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; import tconstruct.util.config.PHConstruct; -import cofh.api.energy.IEnergyContainerItem; /* TE3 support */ diff --git a/src/main/java/tconstruct/plugins/TinkerThaumcraft.java b/src/main/java/tconstruct/plugins/TinkerThaumcraft.java index ed8d5124..c4cd95dd 100644 --- a/src/main/java/tconstruct/plugins/TinkerThaumcraft.java +++ b/src/main/java/tconstruct/plugins/TinkerThaumcraft.java @@ -1,16 +1,15 @@ package tconstruct.plugins; -import mantle.pulsar.pulse.*; - import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.modifiers.armor.AModThaumicVision; import tconstruct.world.TinkerWorld; import thaumcraft.api.ItemApi; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( diff --git a/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java b/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java index eb075ffe..dbcbd5c0 100644 --- a/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java +++ b/src/main/java/tconstruct/plugins/fmp/TinkerFMP.java @@ -1,13 +1,13 @@ package tconstruct.plugins.fmp; +import codechicken.microblock.BlockMicroMaterial; +import cpw.mods.fml.common.event.FMLInitializationEvent; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -import codechicken.microblock.BlockMicroMaterial; -import cpw.mods.fml.common.event.FMLInitializationEvent; @Pulse( id = "Tinkers FMP Compatibility", diff --git a/src/main/java/tconstruct/plugins/gears/TinkerGears.java b/src/main/java/tconstruct/plugins/gears/TinkerGears.java index 3bc3b863..1299165f 100644 --- a/src/main/java/tconstruct/plugins/gears/TinkerGears.java +++ b/src/main/java/tconstruct/plugins/gears/TinkerGears.java @@ -2,9 +2,6 @@ package tconstruct.plugins.gears; import java.util.List; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -12,15 +9,17 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; @Pulse( id = "Tinkers Gears", diff --git a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java index 9ec1ed54..a08023a7 100644 --- a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java +++ b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java @@ -1,16 +1,15 @@ package tconstruct.plugins.ic2; -import mantle.pulsar.pulse.*; - import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.LiquidCasting; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( diff --git a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java index a7e48cf9..5a89b43a 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java @@ -2,10 +2,10 @@ package tconstruct.plugins.imc; import java.util.*; -import mantle.pulsar.pulse.*; -import tconstruct.TConstruct; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; +import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) @Pulse( diff --git a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java index e12138fb..6c1e6e4b 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java @@ -1,13 +1,12 @@ package tconstruct.plugins.imc; -import mantle.pulsar.pulse.*; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.event.*; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.common.event.*; @Pulse( id = "Tinkers BuildCraft Compatibility", diff --git a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java index f809390f..8311fffd 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java @@ -2,12 +2,11 @@ package tconstruct.plugins.imc; import static tconstruct.smeltery.TinkerSmeltery.*; -import mantle.pulsar.pulse.*; - import net.minecraftforge.fluids.Fluid; -import tconstruct.TConstruct; import cpw.mods.fml.common.event.*; +import mantle.pulsar.pulse.*; +import tconstruct.TConstruct; @Pulse( id = "Tinkers Mystcraft Compatibility", diff --git a/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java b/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java index f0ca8d05..1b2115ac 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java @@ -2,14 +2,13 @@ package tconstruct.plugins.imc; import static tconstruct.smeltery.TinkerSmeltery.*; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; - import net.minecraftforge.fluids.Fluid; -import tconstruct.world.TinkerWorld; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; +import tconstruct.world.TinkerWorld; @Pulse(id = "Tinkers RF-Tools Compatibility", forced = true, modsRequired = TinkerRfTools.modid) public class TinkerRfTools { diff --git a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java index 0ce33983..b8bd97e9 100644 --- a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java +++ b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java @@ -1,9 +1,9 @@ package tconstruct.plugins.mfr; -import mantle.pulsar.pulse.*; -import tconstruct.TConstruct; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; +import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) @Pulse( diff --git a/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java b/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java index e6206210..d537c3c7 100644 --- a/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java +++ b/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java @@ -2,11 +2,11 @@ package tconstruct.plugins.nei; import net.minecraft.client.gui.inventory.GuiContainer; -import tconstruct.client.ArmorControls; import codechicken.nei.NEIClientConfig; import codechicken.nei.api.API; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; +import tconstruct.client.ArmorControls; public class BeltToggleFromGuiInputHandler implements IContainerInputHandler { diff --git a/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java b/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java index 07655558..1b71685c 100644 --- a/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java +++ b/src/main/java/tconstruct/plugins/nei/CraftingStationOverlayHandler.java @@ -3,11 +3,11 @@ package tconstruct.plugins.nei; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; +import codechicken.nei.recipe.DefaultOverlayHandler; +import codechicken.nei.recipe.IRecipeHandler; import tconstruct.tools.gui.CraftingStationGui; import tconstruct.tools.inventory.CraftingStationContainer; import tconstruct.tools.logic.CraftingStationLogic; -import codechicken.nei.recipe.DefaultOverlayHandler; -import codechicken.nei.recipe.IRecipeHandler; /** * Modified copy of DefaultOverlayHandler from NotEnoughItems diff --git a/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java b/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java index 7c8d845a..3b91e99a 100644 --- a/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java +++ b/src/main/java/tconstruct/plugins/nei/CraftingStationStackPositioner.java @@ -4,11 +4,11 @@ import java.util.ArrayList; import net.minecraft.client.Minecraft; -import tconstruct.TConstruct; -import tconstruct.tools.gui.CraftingStationGui; import codechicken.nei.PositionedStack; import codechicken.nei.api.IStackPositioner; import codechicken.nei.recipe.GuiRecipe; +import tconstruct.TConstruct; +import tconstruct.tools.gui.CraftingStationGui; public class CraftingStationStackPositioner implements IStackPositioner { diff --git a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java index 042d5286..b475f38d 100644 --- a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java +++ b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java @@ -1,8 +1,8 @@ package tconstruct.plugins.nei; -import tconstruct.tools.gui.CraftingStationGui; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; +import tconstruct.tools.gui.CraftingStationGui; public class NEITConstructConfig implements IConfigureNEI { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java index b5b73a7d..c6c64ec2 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java @@ -9,10 +9,10 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import tconstruct.library.crafting.AlloyMix; -import tconstruct.library.crafting.Smeltery; import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; +import tconstruct.library.crafting.AlloyMix; +import tconstruct.library.crafting.Smeltery; public class RecipeHandlerAlloying extends RecipeHandlerBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java index 1ce92f84..38fb7b8b 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java @@ -7,9 +7,9 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import tconstruct.library.crafting.CastingRecipe; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import tconstruct.library.crafting.CastingRecipe; public abstract class RecipeHandlerCastingBase extends RecipeHandlerBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java index c85d6fbd..f7801c3b 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBasin.java @@ -7,10 +7,10 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import codechicken.lib.gui.GuiDraw; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.LiquidCasting; -import codechicken.lib.gui.GuiDraw; public class RecipeHandlerCastingBasin extends RecipeHandlerCastingBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java index 77d8edcc..9d1747d6 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingTable.java @@ -7,10 +7,10 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import codechicken.lib.gui.GuiDraw; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.LiquidCasting; -import codechicken.lib.gui.GuiDraw; public class RecipeHandlerCastingTable extends RecipeHandlerCastingBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java index 264cda8d..cb3d1239 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java @@ -7,11 +7,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import tconstruct.library.crafting.DryingRackRecipes; -import tconstruct.library.crafting.DryingRackRecipes.DryingRecipe; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import tconstruct.library.crafting.DryingRackRecipes; +import tconstruct.library.crafting.DryingRackRecipes.DryingRecipe; public class RecipeHandlerDryingRack extends RecipeHandlerBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index 9d2fe449..cc629499 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -5,18 +5,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; -import mantle.utils.ItemMetaWrapper; - import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import tconstruct.library.crafting.Smeltery; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; +import mantle.utils.ItemMetaWrapper; +import tconstruct.library.crafting.Smeltery; public class RecipeHandlerMelting extends RecipeHandlerBase { diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index 3d3478eb..0b41bca3 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -10,6 +10,8 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.PositionedStack; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.crafting.PatternBuilder; @@ -23,8 +25,6 @@ import tconstruct.library.util.HarvestLevels; import tconstruct.library.util.IToolPart; import tconstruct.tools.items.ToolPart; import tconstruct.util.config.PHConstruct; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.PositionedStack; public class RecipeHandlerToolMaterials extends RecipeHandlerBase { diff --git a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java index 3bbb7739..5a6328ed 100644 --- a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java +++ b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java @@ -1,7 +1,5 @@ package tconstruct.plugins.te4; -import mantle.pulsar.pulse.*; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -10,14 +8,15 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.*; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( diff --git a/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java index f4d4bcd8..5038ba02 100644 --- a/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java +++ b/src/main/java/tconstruct/plugins/te4/TinkersThermalFoundation.java @@ -1,8 +1,5 @@ package tconstruct.plugins.te4; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -11,14 +8,16 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; @GameRegistry.ObjectHolder(TinkersThermalFoundation.TF_MOD_ID) @Pulse( diff --git a/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java b/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java index c6964c56..12365b0a 100644 --- a/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java +++ b/src/main/java/tconstruct/plugins/ubc/TinkerUBC.java @@ -1,12 +1,12 @@ package tconstruct.plugins.ubc; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import exterminatorJeff.undergroundBiomes.api.UBAPIHook; +import exterminatorJeff.undergroundBiomes.api.UBOreTexturizer.BlocksAreAlreadySet; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import exterminatorJeff.undergroundBiomes.api.UBAPIHook; -import exterminatorJeff.undergroundBiomes.api.UBOreTexturizer.BlocksAreAlreadySet; @Pulse( id = "Tinkers' Underground Biomes Compatiblity", diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java index 4a62565f..9856bc76 100644 --- a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java @@ -2,11 +2,6 @@ package tconstruct.plugins.waila; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,6 +10,10 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.SpecialChars; import tconstruct.smeltery.logic.CastingBasinLogic; public class BasinDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java index f80bf930..7ac722bc 100644 --- a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java @@ -2,8 +2,6 @@ package tconstruct.plugins.waila; import java.util.List; -import mcp.mobius.waila.api.*; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -13,6 +11,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import mcp.mobius.waila.api.*; import tconstruct.smeltery.logic.CastingChannelLogic; public class CastingChannelDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java index 225c0d9b..d215ef0f 100644 --- a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java @@ -2,8 +2,6 @@ package tconstruct.plugins.waila; import java.util.List; -import mcp.mobius.waila.api.*; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,6 +10,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import mcp.mobius.waila.api.*; import tconstruct.smeltery.logic.LavaTankLogic; public class SearedTankDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java index bcbd3665..4bb122f0 100644 --- a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java @@ -2,8 +2,6 @@ package tconstruct.plugins.waila; import java.util.List; -import mcp.mobius.waila.api.*; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,6 +10,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import mcp.mobius.waila.api.*; import tconstruct.smeltery.logic.SmelteryLogic; public class SmelteryDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java index 7d786696..6ea36a49 100644 --- a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java @@ -2,10 +2,6 @@ package tconstruct.plugins.waila; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -13,6 +9,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; import tconstruct.smeltery.logic.CastingTableLogic; public class TableDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java index d6c296ec..7e0fd60d 100644 --- a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java +++ b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java @@ -1,9 +1,9 @@ package tconstruct.plugins.waila; -import mantle.pulsar.pulse.*; -import tconstruct.TConstruct; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; +import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) @Pulse( diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java index 9427870b..800e406a 100644 --- a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java +++ b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java @@ -1,9 +1,8 @@ package tconstruct.plugins.waila; -import mcp.mobius.waila.api.IWailaRegistrar; - import net.minecraftforge.fluids.FluidStack; +import mcp.mobius.waila.api.IWailaRegistrar; import tconstruct.TConstruct; import tconstruct.smeltery.blocks.*; import tconstruct.smeltery.logic.*; diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java index 3e2f5048..bcea156a 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java @@ -1,8 +1,5 @@ package tconstruct.smeltery; -import mantle.client.MProxyClient; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.*; import net.minecraft.item.Item; @@ -13,6 +10,9 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.RenderBlockFluid; +import cpw.mods.fml.client.registry.*; +import mantle.client.MProxyClient; +import mantle.lib.client.MantleClientRegistry; import tconstruct.armor.TinkerArmor; import tconstruct.armor.modelblock.*; import tconstruct.blocks.logic.DryingRackLogic; @@ -22,7 +22,6 @@ import tconstruct.smeltery.gui.*; import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.*; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.client.registry.*; public class SmelteryProxyClient extends SmelteryProxyCommon { diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java index 447461f1..b385bf50 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java @@ -1,13 +1,12 @@ package tconstruct.smeltery; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tconstruct.common.TProxyCommon; import cpw.mods.fml.common.network.IGuiHandler; +import mantle.blocks.abstracts.InventoryLogic; +import tconstruct.common.TProxyCommon; public class SmelteryProxyCommon implements IGuiHandler { diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index 632c1b8c..1ad2408d 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -2,11 +2,6 @@ package tconstruct.smeltery; import java.util.*; -import mantle.blocks.BlockUtils; -import mantle.blocks.abstracts.MultiServantLogic; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; - import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -26,6 +21,17 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import cpw.mods.fml.common.FMLCommonHandler; +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.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.blocks.BlockUtils; +import mantle.blocks.abstracts.MultiServantLogic; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; @@ -43,13 +49,6 @@ import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; import tconstruct.world.items.OreBerries; -import cpw.mods.fml.common.FMLCommonHandler; -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.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' Smeltery", description = "Liquid metals, casting, and the multiblock structure.") diff --git a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java index c8df5cf8..633c63ae 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java @@ -1,20 +1,19 @@ package tconstruct.smeltery; -import mantle.world.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.init.Items; import net.minecraft.item.*; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraftforge.event.entity.player.*; +import cpw.mods.fml.common.eventhandler.*; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; +import mantle.world.WorldHelper; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.tools.AbilityHelper; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.common.eventhandler.*; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class TinkerSmelteryEvents { diff --git a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java index efecd473..251262f9 100644 --- a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java @@ -12,12 +12,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.CastingChannelLogic; import tconstruct.smeltery.model.BlockRenderCastingChannel; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * @author BluSunrize diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java index 5caa5978..a7d4521c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java @@ -7,8 +7,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; import net.minecraft.world.*; -import tconstruct.blocks.TConstructBlock; import cpw.mods.fml.relauncher.*; +import tconstruct.blocks.TConstructBlock; public class GlassBlock extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index fd67fe59..c85e74a1 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -1,16 +1,15 @@ package tconstruct.smeltery.blocks; -import mantle.blocks.MantleBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.*; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.*; /** * @author fuj1n diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java index bd73af51..319bb574 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java @@ -9,8 +9,8 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; -import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.*; +import tconstruct.util.config.PHConstruct; /** * @author fuj1n diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java index f7092e51..401d7e13 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java @@ -6,8 +6,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import tconstruct.blocks.TConstructBlock; import cpw.mods.fml.relauncher.*; +import tconstruct.blocks.TConstructBlock; public class GlassBlockStained extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index 76e05e12..403390dc 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -10,9 +10,9 @@ import net.minecraft.util.*; import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.*; import tconstruct.smeltery.model.PaneConnectedRender; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.*; public class GlassPaneConnected extends GlassBlockConnected { diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java index 9865e3b4..e74ffb6e 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java @@ -2,8 +2,6 @@ package tconstruct.smeltery.blocks; import java.util.List; -import mantle.blocks.iface.IServantLogic; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -23,12 +21,13 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mantle.blocks.iface.IServantLogic; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.itemblocks.LavaTankItemBlock; import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.smeltery.model.TankRender; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class LavaTankBlock extends BlockContainer { diff --git a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java index cb6d92e9..3884411e 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java @@ -7,9 +7,9 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.*; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.relauncher.*; public class LiquidMetalFinite extends BlockFluidFinite { diff --git a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java index 7af220ed..add0b275 100644 --- a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java +++ b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java @@ -9,8 +9,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; -import tconstruct.smeltery.model.PaneRender; import cpw.mods.fml.relauncher.*; +import tconstruct.smeltery.model.PaneRender; public class PaneBase extends BlockStainedGlassPane { diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index 0331d0ce..a9731ad3 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -2,8 +2,6 @@ package tconstruct.smeltery.blocks; import java.util.List; -import mantle.blocks.abstracts.InventoryBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -13,11 +11,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.CastingBlockRender; -import cpw.mods.fml.relauncher.*; public class SearedBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java index aedd58b3..ed774529 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java @@ -8,10 +8,10 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.*; import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.relauncher.*; public class SearedSlab extends SlabBase { diff --git a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java index e75ecbd0..940873e9 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java @@ -2,9 +2,6 @@ package tconstruct.smeltery.blocks; import java.util.*; -import mantle.blocks.abstracts.*; -import mantle.blocks.iface.*; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -16,12 +13,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.*; +import mantle.blocks.iface.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.SmelteryProxyCommon; import tconstruct.smeltery.logic.*; import tconstruct.smeltery.model.SmelteryRender; -import cpw.mods.fml.relauncher.*; public class SmelteryBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java index c05392b6..219d2488 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java @@ -8,8 +8,8 @@ import net.minecraft.entity.Entity; import net.minecraft.item.*; import net.minecraft.world.World; -import tconstruct.blocks.TConstructBlock; import cpw.mods.fml.relauncher.*; +import tconstruct.blocks.TConstructBlock; public class SpeedBlock extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java index 4f81a8e8..dc0f77d1 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java @@ -10,10 +10,10 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.relauncher.*; public class SpeedSlab extends SlabBase { diff --git a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java index 63b5e2f3..307de431 100644 --- a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java @@ -5,8 +5,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.*; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.*; +import tconstruct.library.TConstructRegistry; public class TConstructFluid extends BlockFluidClassic { diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index 80fa3b17..0cf648b0 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -14,11 +14,11 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.*; +import cpw.mods.fml.common.Loader; import tconstruct.TConstruct; import tconstruct.smeltery.inventory.*; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.network.SmelteryPacket; -import cpw.mods.fml.common.Loader; public class SmelteryGui extends ActiveContainerGui { diff --git a/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java b/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java index 3c384932..c54d7c9a 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/CastingChannelItem.java @@ -1,9 +1,9 @@ package tconstruct.smeltery.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class CastingChannelItem extends MultiItemBlock { public static final String[] blockTypes = { "Channel" }; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java index a4f34cd8..7c06f5e8 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassBlockItem.java @@ -2,13 +2,13 @@ package tconstruct.smeltery.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import mantle.blocks.abstracts.MultiItemBlock; + public class GlassBlockItem extends MultiItemBlock { public static final String[] blockTypes = { "pure" }; // , "soul", diff --git a/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java b/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java index 436edbc4..63f14aab 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/GlassPaneItem.java @@ -1,9 +1,9 @@ package tconstruct.smeltery.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class GlassPaneItem extends MultiItemBlock { public static final String[] blockTypes = { "pure", "soul", "soul.pure" }; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java index 9d689ee7..bf15c535 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/LavaTankItemBlock.java @@ -2,8 +2,6 @@ package tconstruct.smeltery.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,6 +10,7 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import mantle.blocks.abstracts.MultiItemBlock; import tconstruct.smeltery.logic.LavaTankLogic; public class LavaTankItemBlock extends MultiItemBlock implements IFluidContainerItem { diff --git a/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java index 9d3bfefb..24c57ee7 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/MetalItemBlock.java @@ -2,13 +2,13 @@ package tconstruct.smeltery.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import mantle.blocks.abstracts.MultiItemBlock; + public class MetalItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java index 580c0247..dc79afd0 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SearedSlabItem.java @@ -1,9 +1,9 @@ package tconstruct.smeltery.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class SearedSlabItem extends MultiItemBlock { public static final String[] blockTypes = { "brick", "stone", "cobble", "paver", "road", "fancy", "square", diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java index d029469f..275d2ab6 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SearedTableItemBlock.java @@ -2,13 +2,13 @@ package tconstruct.smeltery.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import mantle.blocks.abstracts.MultiItemBlock; + public class SearedTableItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "Table", "Faucet", "Basin" }; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java index d5acb975..7c023acc 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java @@ -2,16 +2,15 @@ package tconstruct.smeltery.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.achievements.TAchievements; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.MultiItemBlock; +import tconstruct.achievements.TAchievements; public class SmelteryItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java index f5790f49..a398a2c1 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedBlockItem.java @@ -2,13 +2,13 @@ package tconstruct.smeltery.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import mantle.blocks.abstracts.MultiItemBlock; + public class SpeedBlockItem extends MultiItemBlock { public static final String[] blockTypes = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java index 9266e87f..c4b8adf9 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SpeedSlabItem.java @@ -2,13 +2,13 @@ package tconstruct.smeltery.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import mantle.blocks.abstracts.MultiItemBlock; + public class SpeedSlabItem extends MultiItemBlock { public static final String[] blockTypes = { "brownstone.rough", "brownstone.rough.road", "brownstone.smooth", diff --git a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java index 252a79cb..03d0df41 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearItem.java @@ -1,9 +1,9 @@ package tconstruct.smeltery.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class StainedGlassClearItem extends MultiItemBlock { public static final String[] blockTypes = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", diff --git a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java index 82f3f6ce..296552c0 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/StainedGlassClearPaneItem.java @@ -1,9 +1,9 @@ package tconstruct.smeltery.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class StainedGlassClearPaneItem extends MultiItemBlock { public static final String[] blockTypes = { "white", "orange", "magenta", "lightblue", "yellow", "lime", "pink", diff --git a/src/main/java/tconstruct/smeltery/items/FilledBucket.java b/src/main/java/tconstruct/smeltery/items/FilledBucket.java index eebae0e7..00621e2f 100644 --- a/src/main/java/tconstruct/smeltery/items/FilledBucket.java +++ b/src/main/java/tconstruct/smeltery/items/FilledBucket.java @@ -2,8 +2,6 @@ package tconstruct.smeltery.items; import java.util.List; -import mantle.world.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -14,9 +12,10 @@ import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; +import cpw.mods.fml.relauncher.*; +import mantle.world.WorldHelper; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.relauncher.*; public class FilledBucket extends ItemBucket { diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java index ebd08ef1..75190d14 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java @@ -1,7 +1,5 @@ package tconstruct.smeltery.logic; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; @@ -14,12 +12,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import cpw.mods.fml.common.eventhandler.Event; +import mantle.blocks.abstracts.InventoryLogic; import tconstruct.TConstruct; import tconstruct.library.crafting.*; import tconstruct.library.event.*; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.util.IPattern; -import cpw.mods.fml.common.eventhandler.Event; public abstract class CastingBlockLogic extends InventoryLogic implements IFluidTank, IFluidHandler, ISidedInventory { diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index d0e513cb..27f703f7 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -10,8 +10,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; -import tconstruct.TConstruct; import cpw.mods.fml.relauncher.*; +import tconstruct.TConstruct; /** * @author BluSunrize diff --git a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java index 4190bc2c..6f399b5b 100644 --- a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java @@ -1,7 +1,5 @@ package tconstruct.smeltery.logic; -import mantle.blocks.iface.*; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.*; @@ -10,6 +8,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import mantle.blocks.iface.*; import tconstruct.TConstruct; public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler { diff --git a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java index 1c5ad811..38d6bed0 100644 --- a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java @@ -1,13 +1,13 @@ package tconstruct.smeltery.logic; -import mantle.blocks.abstracts.MultiServantLogic; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.*; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import mantle.blocks.abstracts.MultiServantLogic; + public class LavaTankLogic extends MultiServantLogic implements IFluidHandler { public FluidTank tank; diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index 3065eeac..45e97da1 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -1,9 +1,5 @@ package tconstruct.smeltery.logic; -import mantle.blocks.abstracts.MultiServantLogic; -import mantle.blocks.iface.IFacingLogic; -import mantle.world.CoordTuple; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.*; @@ -12,6 +8,10 @@ import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import mantle.blocks.abstracts.MultiServantLogic; +import mantle.blocks.iface.IFacingLogic; +import mantle.world.CoordTuple; + public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic { byte direction; diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index c0723e55..6d069240 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -4,14 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import mantle.blocks.abstracts.InventoryLogic; -import mantle.blocks.abstracts.MultiServantLogic; -import mantle.blocks.iface.IActiveLogic; -import mantle.blocks.iface.IFacingLogic; -import mantle.blocks.iface.IMasterLogic; -import mantle.blocks.iface.IServantLogic; -import mantle.world.CoordTuple; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -37,14 +29,21 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import mantle.blocks.abstracts.InventoryLogic; +import mantle.blocks.abstracts.MultiServantLogic; +import mantle.blocks.iface.IActiveLogic; +import mantle.blocks.iface.IFacingLogic; +import mantle.blocks.iface.IMasterLogic; +import mantle.blocks.iface.IServantLogic; +import mantle.world.CoordTuple; import tconstruct.TConstruct; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.SmelteryDamageSource; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /* * Simple class for storing items in the block diff --git a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java index a9703362..4a92c465 100644 --- a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java @@ -10,9 +10,9 @@ import net.minecraftforge.fluids.*; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.*; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.CastingChannelLogic; -import cpw.mods.fml.client.registry.*; /** * @author BluSunrize diff --git a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java index f3252167..0b53bec1 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java @@ -7,10 +7,10 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.*; import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.logic.CastingBasinLogic; import tconstruct.tools.entity.FancyEntityItem; -import cpw.mods.fml.relauncher.*; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java index fd3eaff5..fd629c9c 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java @@ -6,13 +6,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.client.registry.*; import tconstruct.TConstruct; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.library.crafting.CastingRecipe; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.*; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.*; public class CastingBlockRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java index dd1717a4..4632d3af 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java @@ -7,11 +7,11 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.*; import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.CastingTableLogic; import tconstruct.tools.entity.FancyEntityItem; -import cpw.mods.fml.relauncher.*; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java index 1e136108..bbbfd519 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java @@ -7,8 +7,8 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import tconstruct.smeltery.blocks.GlassPaneConnected; import cpw.mods.fml.client.registry.*; +import tconstruct.smeltery.blocks.GlassPaneConnected; public class PaneConnectedRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/PaneRender.java b/src/main/java/tconstruct/smeltery/model/PaneRender.java index df048e93..55d5af6a 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneRender.java @@ -4,8 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import tconstruct.util.ItemHelper; import cpw.mods.fml.client.registry.*; +import tconstruct.util.ItemHelper; public class PaneRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java index 71ee2847..dc568742 100644 --- a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java +++ b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java @@ -1,7 +1,5 @@ package tconstruct.smeltery.model; -import mantle.world.CoordTuple; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; @@ -9,11 +7,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.*; +import cpw.mods.fml.client.registry.*; +import mantle.world.CoordTuple; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.*; public class SmelteryRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java b/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java index 31e8ec44..b3b2e9b0 100644 --- a/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/TankItemRenderer.java @@ -8,8 +8,8 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import tconstruct.util.ItemHelper; import cpw.mods.fml.client.registry.RenderingRegistry; +import tconstruct.util.ItemHelper; public class TankItemRenderer implements IItemRenderer { diff --git a/src/main/java/tconstruct/smeltery/model/TankRender.java b/src/main/java/tconstruct/smeltery/model/TankRender.java index 785f3475..9cb8c357 100644 --- a/src/main/java/tconstruct/smeltery/model/TankRender.java +++ b/src/main/java/tconstruct/smeltery/model/TankRender.java @@ -8,10 +8,10 @@ import net.minecraftforge.fluids.*; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.*; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.util.ItemHelper; -import cpw.mods.fml.client.registry.*; public class TankRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java index cf1c6a84..76a1dfe6 100644 --- a/src/main/java/tconstruct/tools/TinkerToolEvents.java +++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java @@ -22,6 +22,9 @@ import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import tconstruct.TConstruct; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.TConstructRegistry; @@ -33,9 +36,6 @@ import tconstruct.library.tools.*; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; import tconstruct.util.network.MovementUpdatePacket; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class TinkerToolEvents { diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 78834596..19e5b8a4 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -2,9 +2,6 @@ package tconstruct.tools; import static net.minecraft.util.EnumChatFormatting.*; -import mantle.pulsar.pulse.*; -import mantle.utils.RecipeRemover; - import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.material.Material; @@ -15,6 +12,12 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.*; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; +import mantle.utils.RecipeRemover; import tconstruct.TConstruct; import tconstruct.achievements.items.CraftAchievementItem; import tconstruct.common.itemblocks.MetadataItemBlock; @@ -37,10 +40,6 @@ import tconstruct.world.TDispenserBehaviorSpawnEgg; import tconstruct.world.TinkerWorld; import tconstruct.world.blocks.SoilBlock; import tconstruct.world.itemblocks.CraftedSoilItemBlock; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse( diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index 4b30cf6d..3060f889 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -2,9 +2,6 @@ package tconstruct.tools; import static tconstruct.tools.TinkerTools.*; -import mantle.client.MProxyClient; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.*; @@ -15,6 +12,10 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import mantle.client.MProxyClient; +import mantle.lib.client.MantleClientRegistry; import tconstruct.client.FlexibleToolRenderer; import tconstruct.client.entity.projectile.*; import tconstruct.client.pages.*; @@ -30,8 +31,6 @@ import tconstruct.tools.gui.*; import tconstruct.tools.logic.*; import tconstruct.tools.model.*; import tconstruct.weaponry.TinkerWeaponry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ToolProxyClient extends ToolProxyCommon { diff --git a/src/main/java/tconstruct/tools/ToolProxyCommon.java b/src/main/java/tconstruct/tools/ToolProxyCommon.java index bb1a7e75..f8fc1e17 100644 --- a/src/main/java/tconstruct/tools/ToolProxyCommon.java +++ b/src/main/java/tconstruct/tools/ToolProxyCommon.java @@ -1,13 +1,12 @@ package tconstruct.tools; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tconstruct.common.TProxyCommon; import cpw.mods.fml.common.network.IGuiHandler; +import mantle.blocks.abstracts.InventoryLogic; +import tconstruct.common.TProxyCommon; public class ToolProxyCommon implements IGuiHandler { diff --git a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java index 1d9107e9..39aeaed4 100644 --- a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java +++ b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java @@ -10,9 +10,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; import tconstruct.tools.logic.BattlesignLogic; import tconstruct.tools.model.BattlesignRender; -import cpw.mods.fml.relauncher.*; public class BattlesignBlock extends EquipBlock { diff --git a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java index d0c774db..736e5296 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java @@ -2,8 +2,6 @@ package tconstruct.tools.blocks; import java.util.List; -import mantle.blocks.abstracts.InventorySlab; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -16,12 +14,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventorySlab; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.*; import tconstruct.tools.logic.*; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.*; public class CraftingSlab extends InventorySlab { diff --git a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java index 710bfc7c..466a119d 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java @@ -2,8 +2,6 @@ package tconstruct.tools.blocks; import java.util.List; -import mantle.blocks.abstracts.InventoryBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -13,12 +11,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.CraftingStationLogic; import tconstruct.tools.model.TableRender; -import cpw.mods.fml.relauncher.*; public class CraftingStationBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java index 96a3e7bf..91c12cbb 100644 --- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -2,8 +2,6 @@ package tconstruct.tools.blocks; import java.util.Random; -import mantle.blocks.abstracts.InventoryBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,12 +15,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.*; import tconstruct.tools.model.FrypanRender; -import cpw.mods.fml.relauncher.*; public class EquipBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java index a056b306..bc9ce963 100644 --- a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java @@ -2,9 +2,6 @@ package tconstruct.tools.blocks; import java.util.Random; -import mantle.blocks.abstracts.InventorySlab; -import mantle.blocks.iface.*; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -12,11 +9,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventorySlab; +import mantle.blocks.iface.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.FurnaceLogic; -import cpw.mods.fml.relauncher.*; public class FurnaceSlab extends InventorySlab { diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrick.java b/src/main/java/tconstruct/tools/blocks/MultiBrick.java index 629fe2d5..78a2af69 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrick.java @@ -7,8 +7,8 @@ import net.minecraft.init.Blocks; import net.minecraft.util.*; import net.minecraft.world.*; -import tconstruct.blocks.TConstructBlock; import cpw.mods.fml.relauncher.*; +import tconstruct.blocks.TConstructBlock; public class MultiBrick extends TConstructBlock { diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java index 7f2084c0..b1a94bd1 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java @@ -7,8 +7,8 @@ import net.minecraft.init.Blocks; import net.minecraft.util.*; import net.minecraft.world.*; -import tconstruct.blocks.TConstructBlock; import cpw.mods.fml.relauncher.*; +import tconstruct.blocks.TConstructBlock; public class MultiBrickFancy extends TConstructBlock { diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java b/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java index 419cbe0e..b031619f 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickMetal.java @@ -5,9 +5,9 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import tconstruct.blocks.TConstructBlock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.blocks.TConstructBlock; public class MultiBrickMetal extends TConstructBlock { diff --git a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java index e1b4d685..73da21f1 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java @@ -2,8 +2,6 @@ package tconstruct.tools.blocks; import java.util.List; -import mantle.blocks.abstracts.InventoryBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,13 +14,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; import tconstruct.tools.logic.ToolForgeLogic; import tconstruct.tools.model.TableRender; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.*; public class ToolForgeBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java index 154197a2..c0fbe4af 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java @@ -2,8 +2,6 @@ package tconstruct.tools.blocks; import java.util.List; -import mantle.blocks.abstracts.InventoryBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -17,13 +15,14 @@ import net.minecraft.util.*; import net.minecraft.world.*; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.*; import tconstruct.tools.model.TableRender; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.relauncher.*; public class ToolStationBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/tools/entity/RotatingBase.java b/src/main/java/tconstruct/tools/entity/RotatingBase.java index 54f30e59..487771a3 100644 --- a/src/main/java/tconstruct/tools/entity/RotatingBase.java +++ b/src/main/java/tconstruct/tools/entity/RotatingBase.java @@ -11,10 +11,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.world.World; -import tconstruct.library.tools.AbilityHelper; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import io.netty.buffer.ByteBuf; +import tconstruct.library.tools.AbilityHelper; @Deprecated public class RotatingBase extends Entity implements IEntityAdditionalSpawnData { diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index d98a79cc..be6ac3c5 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -17,16 +17,16 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; import tconstruct.tools.logic.CraftingStationLogic; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; -import cpw.mods.fml.common.Optional; @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class CraftingStationGui extends GuiContainer implements INEIGuiHandler { diff --git a/src/main/java/tconstruct/tools/gui/FurnaceGui.java b/src/main/java/tconstruct/tools/gui/FurnaceGui.java index 5df957b9..d6f77747 100644 --- a/src/main/java/tconstruct/tools/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/tools/gui/FurnaceGui.java @@ -7,9 +7,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.*; import tconstruct.tools.inventory.FurnaceContainer; import tconstruct.tools.logic.FurnaceLogic; -import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class FurnaceGui extends GuiContainer { diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java index d679f242..01d6b845 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java @@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import tconstruct.library.client.ToolGuiElement; import cpw.mods.fml.relauncher.*; +import tconstruct.library.client.ToolGuiElement; @SideOnly(Side.CLIENT) public class GuiButtonTool extends GuiButton { diff --git a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java index 12287d80..0146b38e 100644 --- a/src/main/java/tconstruct/tools/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/tools/gui/PartCrafterGui.java @@ -12,16 +12,16 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.HarvestLevels; import tconstruct.tools.inventory.PartCrafterChestContainer; import tconstruct.tools.logic.PartBuilderLogic; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; -import cpw.mods.fml.common.Optional; @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class PartCrafterGui extends GuiContainer implements INEIGuiHandler { diff --git a/src/main/java/tconstruct/tools/gui/StencilTableGui.java b/src/main/java/tconstruct/tools/gui/StencilTableGui.java index 9fdbf287..c72dc160 100644 --- a/src/main/java/tconstruct/tools/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/tools/gui/StencilTableGui.java @@ -12,16 +12,16 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; +import cpw.mods.fml.common.Optional; import tconstruct.TConstruct; import tconstruct.library.client.*; import tconstruct.library.crafting.StencilBuilder; import tconstruct.tools.inventory.PatternShaperContainer; import tconstruct.tools.logic.StencilTableLogic; import tconstruct.util.network.PatternTablePacket; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; -import cpw.mods.fml.common.Optional; @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") public class StencilTableGui extends GuiContainer implements INEIGuiHandler { diff --git a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java index 5ca2ccfd..f2ec7586 100644 --- a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; import tconstruct.library.client.*; import tconstruct.tools.logic.ToolForgeLogic; -import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class ToolForgeGui extends ToolStationGui { diff --git a/src/main/java/tconstruct/tools/gui/ToolStationGui.java b/src/main/java/tconstruct/tools/gui/ToolStationGui.java index 012042c9..0d07c762 100644 --- a/src/main/java/tconstruct/tools/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolStationGui.java @@ -15,18 +15,18 @@ import net.minecraft.world.World; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import tconstruct.TConstruct; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.client.ToolGuiElement; -import tconstruct.tools.inventory.ToolStationContainer; -import tconstruct.tools.logic.ToolStationLogic; -import tconstruct.util.network.ToolStationPacket; import codechicken.nei.VisiblityData; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.TConstruct; +import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.client.ToolGuiElement; +import tconstruct.tools.inventory.ToolStationContainer; +import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.util.network.ToolStationPacket; @SideOnly(Side.CLIENT) @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") diff --git a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index 7d42bbdd..757d23bb 100644 --- a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -6,8 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; -import tconstruct.tools.logic.FurnaceLogic; import cpw.mods.fml.relauncher.*; +import tconstruct.tools.logic.FurnaceLogic; public class FurnaceContainer extends Container { diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java index 6e1c7c68..184776b9 100644 --- a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java @@ -1,11 +1,11 @@ package tconstruct.tools.inventory; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; +import mantle.blocks.abstracts.InventoryLogic; + public class InventoryCraftingStation extends InventoryCrafting { /** the width of the crafting inventory */ diff --git a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java index 495c125b..7b1f05cb 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java @@ -5,10 +5,10 @@ import net.minecraft.entity.player.*; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; +import invtweaks.api.container.ChestContainer; import tconstruct.library.util.IPattern; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.PatternChestLogic; -import invtweaks.api.container.ChestContainer; @ChestContainer public class PatternChestContainer extends Container { diff --git a/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java index 1ebef972..3f304c6c 100644 --- a/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/CraftingSlabItemBlock.java @@ -1,11 +1,11 @@ package tconstruct.tools.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; +import mantle.blocks.abstracts.MultiItemBlock; + public class CraftingSlabItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "tile.CraftingStation", "Crafter", "Parts", "PatternShaper", diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java index cb5ab132..9426f5f7 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java @@ -2,14 +2,13 @@ package tconstruct.tools.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.MultiItemBlock; public class MultiBrickFancyItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java index 4add2640..3aec2b76 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java @@ -2,14 +2,13 @@ package tconstruct.tools.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.MultiItemBlock; public class MultiBrickItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java index 2fd0c52a..61b43a3f 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickMetalItem.java @@ -1,9 +1,9 @@ package tconstruct.tools.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class MultiBrickMetalItem extends MultiItemBlock { static String[] blockTypes = { "brick.alumite", "brick.ardite", "brick.cobalt", "brick.manyullyn", diff --git a/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java index 1ec73d97..931a038b 100644 --- a/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java +++ b/src/main/java/tconstruct/tools/itemblocks/ToolStationItemBlock.java @@ -1,9 +1,9 @@ package tconstruct.tools.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class ToolStationItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "Crafter", "Parts", "Parts", "Parts", "Parts", "PatternChest", diff --git a/src/main/java/tconstruct/tools/items/Bowstring.java b/src/main/java/tconstruct/tools/items/Bowstring.java index c11403ed..d5b2055a 100644 --- a/src/main/java/tconstruct/tools/items/Bowstring.java +++ b/src/main/java/tconstruct/tools/items/Bowstring.java @@ -2,15 +2,14 @@ package tconstruct.tools.items; import java.util.List; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; +import cpw.mods.fml.common.Loader; +import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.common.Loader; public class Bowstring extends CraftingItem implements IToolPart { diff --git a/src/main/java/tconstruct/tools/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java index e8bba019..944715a9 100644 --- a/src/main/java/tconstruct/tools/items/CreativeModifier.java +++ b/src/main/java/tconstruct/tools/items/CreativeModifier.java @@ -9,10 +9,10 @@ import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.*; import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.relauncher.*; public class CreativeModifier extends Item { diff --git a/src/main/java/tconstruct/tools/items/Fletching.java b/src/main/java/tconstruct/tools/items/Fletching.java index 407a24d1..ab5fde7c 100644 --- a/src/main/java/tconstruct/tools/items/Fletching.java +++ b/src/main/java/tconstruct/tools/items/Fletching.java @@ -1,9 +1,8 @@ package tconstruct.tools.items; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.item.ItemStack; +import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; diff --git a/src/main/java/tconstruct/tools/items/Manual.java b/src/main/java/tconstruct/tools/items/Manual.java index 3d18d24b..e1a2c81f 100644 --- a/src/main/java/tconstruct/tools/items/Manual.java +++ b/src/main/java/tconstruct/tools/items/Manual.java @@ -2,21 +2,20 @@ package tconstruct.tools.items; import java.util.List; -import mantle.books.BookData; -import mantle.client.gui.GuiManual; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.relauncher.*; +import mantle.books.BookData; +import mantle.client.gui.GuiManual; +import mantle.items.abstracts.CraftingItem; import tconstruct.TConstruct; import tconstruct.achievements.TAchievements; import tconstruct.client.TProxyClient; import tconstruct.library.TConstructRegistry; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.*; public class Manual extends CraftingItem { diff --git a/src/main/java/tconstruct/tools/items/ManualInfo.java b/src/main/java/tconstruct/tools/items/ManualInfo.java index ec64885d..287a260d 100644 --- a/src/main/java/tconstruct/tools/items/ManualInfo.java +++ b/src/main/java/tconstruct/tools/items/ManualInfo.java @@ -1,14 +1,13 @@ package tconstruct.tools.items; -import mantle.books.*; - import net.minecraft.util.*; import org.w3c.dom.Document; -import tconstruct.client.TProxyClient; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import mantle.books.*; +import tconstruct.client.TProxyClient; public class ManualInfo { // static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary" }; diff --git a/src/main/java/tconstruct/tools/items/MaterialItem.java b/src/main/java/tconstruct/tools/items/MaterialItem.java index bc5f86b2..15feacc0 100644 --- a/src/main/java/tconstruct/tools/items/MaterialItem.java +++ b/src/main/java/tconstruct/tools/items/MaterialItem.java @@ -2,15 +2,14 @@ package tconstruct.tools.items; import java.util.List; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mantle.items.abstracts.CraftingItem; +import tconstruct.library.TConstructRegistry; public class MaterialItem extends CraftingItem { diff --git a/src/main/java/tconstruct/tools/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java index de4458b5..c92d1e47 100644 --- a/src/main/java/tconstruct/tools/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -4,17 +4,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.*; +import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder.MaterialSet; import tconstruct.library.util.IPattern; -import cpw.mods.fml.relauncher.*; public class Pattern extends CraftingItem implements IPattern { diff --git a/src/main/java/tconstruct/tools/items/TitleIcon.java b/src/main/java/tconstruct/tools/items/TitleIcon.java index d7243111..8acba7dc 100644 --- a/src/main/java/tconstruct/tools/items/TitleIcon.java +++ b/src/main/java/tconstruct/tools/items/TitleIcon.java @@ -12,12 +12,12 @@ import net.minecraft.item.*; import net.minecraft.util.*; import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.*; import tconstruct.client.TProxyClient; import tconstruct.library.tools.ToolCore; import tconstruct.world.entity.BlueSlime; import tconstruct.world.entity.KingBlueSlime; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.*; // spawn egg. public class TitleIcon extends Item { diff --git a/src/main/java/tconstruct/tools/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java index b005fa73..6f8eacf7 100644 --- a/src/main/java/tconstruct/tools/items/ToolPart.java +++ b/src/main/java/tconstruct/tools/items/ToolPart.java @@ -2,12 +2,11 @@ package tconstruct.tools.items; import java.util.List; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.*; import net.minecraft.util.StatCollector; +import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java index c4ab2440..76cc3235 100644 --- a/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/CraftingStationLogic.java @@ -2,8 +2,6 @@ package tconstruct.tools.logic; import java.lang.ref.WeakReference; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -16,6 +14,7 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import mantle.blocks.abstracts.InventoryLogic; import tconstruct.tools.inventory.CraftingStationContainer; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/tools/logic/EquipLogic.java b/src/main/java/tconstruct/tools/logic/EquipLogic.java index 9d24aaef..05e70e49 100644 --- a/src/main/java/tconstruct/tools/logic/EquipLogic.java +++ b/src/main/java/tconstruct/tools/logic/EquipLogic.java @@ -1,12 +1,12 @@ package tconstruct.tools.logic; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import mantle.blocks.abstracts.InventoryLogic; + /* * Slots 0: Frying pan item 1: Fuel 2-9: Food */ diff --git a/src/main/java/tconstruct/tools/logic/FrypanLogic.java b/src/main/java/tconstruct/tools/logic/FrypanLogic.java index 14109fb3..733e082e 100644 --- a/src/main/java/tconstruct/tools/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/tools/logic/FrypanLogic.java @@ -1,8 +1,5 @@ package tconstruct.tools.logic; -import mantle.blocks.BlockUtils; -import mantle.blocks.iface.IActiveLogic; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.InventoryPlayer; @@ -13,8 +10,10 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.tools.inventory.FrypanContainer; import cpw.mods.fml.common.registry.GameRegistry; +import mantle.blocks.BlockUtils; +import mantle.blocks.iface.IActiveLogic; +import tconstruct.tools.inventory.FrypanContainer; /* * Slots 0: Frying pan item 1: Fuel 2-9: Food diff --git a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java index 5ac68a48..421f0f36 100644 --- a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java @@ -1,9 +1,5 @@ package tconstruct.tools.logic; -import mantle.blocks.BlockUtils; -import mantle.blocks.abstracts.InventoryLogic; -import mantle.blocks.iface.*; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -19,8 +15,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.tools.inventory.FurnaceContainer; import cpw.mods.fml.common.registry.GameRegistry; +import mantle.blocks.BlockUtils; +import mantle.blocks.abstracts.InventoryLogic; +import mantle.blocks.iface.*; +import tconstruct.tools.inventory.FurnaceContainer; /* * Slots 0: Input 1: Fuel 2: Output 3-16: Chest diff --git a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java index ea5cc2a9..ebd983c5 100644 --- a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java @@ -1,7 +1,5 @@ package tconstruct.tools.logic; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; @@ -9,6 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import mantle.blocks.abstracts.InventoryLogic; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.util.IPattern; import tconstruct.tools.inventory.*; diff --git a/src/main/java/tconstruct/tools/logic/PatternChestLogic.java b/src/main/java/tconstruct/tools/logic/PatternChestLogic.java index 34c8b56c..f805c064 100644 --- a/src/main/java/tconstruct/tools/logic/PatternChestLogic.java +++ b/src/main/java/tconstruct/tools/logic/PatternChestLogic.java @@ -1,12 +1,11 @@ package tconstruct.tools.logic; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import mantle.blocks.abstracts.InventoryLogic; import tconstruct.library.util.IPattern; import tconstruct.tools.inventory.PatternChestContainer; diff --git a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java index f969e100..718c2c5b 100644 --- a/src/main/java/tconstruct/tools/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/tools/logic/StencilTableLogic.java @@ -1,7 +1,5 @@ package tconstruct.tools.logic; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; @@ -9,6 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import mantle.blocks.abstracts.InventoryLogic; import tconstruct.library.crafting.StencilBuilder; import tconstruct.tools.inventory.PatternShaperContainer; diff --git a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java index 7ba06be2..29b6f537 100644 --- a/src/main/java/tconstruct/tools/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolStationLogic.java @@ -1,7 +1,5 @@ package tconstruct.tools.logic; -import mantle.blocks.abstracts.InventoryLogic; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Container; @@ -10,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import mantle.blocks.abstracts.InventoryLogic; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.IModifyable; diff --git a/src/main/java/tconstruct/tools/model/TableRender.java b/src/main/java/tconstruct/tools/model/TableRender.java index efa6284e..f2be34e2 100644 --- a/src/main/java/tconstruct/tools/model/TableRender.java +++ b/src/main/java/tconstruct/tools/model/TableRender.java @@ -6,8 +6,8 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import tconstruct.tools.TinkerTools; import cpw.mods.fml.client.registry.*; +import tconstruct.tools.TinkerTools; public class TableRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index aaf33026..b0345b0b 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -1,8 +1,8 @@ package tconstruct.util; -import mantle.crash.CallableSuppConfig; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ICrashCallable; +import mantle.crash.CallableSuppConfig; public class EnvironmentChecks { diff --git a/src/main/java/tconstruct/util/IMCHandler.java b/src/main/java/tconstruct/util/IMCHandler.java index 0e73cc50..d77446d1 100644 --- a/src/main/java/tconstruct/util/IMCHandler.java +++ b/src/main/java/tconstruct/util/IMCHandler.java @@ -10,6 +10,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import cofh.api.energy.IEnergyContainerItem; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.event.FMLInterModComms; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; @@ -22,10 +26,6 @@ import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.IPattern; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.TinkerTools; -import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.event.FMLInterModComms; public final class IMCHandler { diff --git a/src/main/java/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java index 2d6d6c40..87cf2c3f 100644 --- a/src/main/java/tconstruct/util/config/DimensionBlacklist.java +++ b/src/main/java/tconstruct/util/config/DimensionBlacklist.java @@ -5,8 +5,8 @@ import java.util.ArrayList; import net.minecraftforge.common.config.Configuration; -import tconstruct.TConstruct; import cpw.mods.fml.common.Loader; +import tconstruct.TConstruct; public class DimensionBlacklist { diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 0ac2db7c..f7123b50 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -7,11 +7,11 @@ import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import com.google.common.collect.Sets; + import tconstruct.TConstruct; import tconstruct.library.tools.AbilityHelper; -import com.google.common.collect.Sets; - public class PHConstruct { public static void initProps(File location) { diff --git a/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java b/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java index 493a7479..d644733b 100644 --- a/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java +++ b/src/main/java/tconstruct/util/network/AccessoryInventoryPacket.java @@ -1,16 +1,15 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; import tconstruct.TConstruct; import tconstruct.armor.ArmorProxyCommon; import tconstruct.armor.TinkerArmor; import tconstruct.armor.player.TPlayerStats; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class AccessoryInventoryPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java b/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java index 22597c74..541de532 100644 --- a/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java +++ b/src/main/java/tconstruct/util/network/ArmourGuiSyncPacket.java @@ -1,15 +1,14 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.armor.TinkerArmor; -import tconstruct.armor.player.TPlayerStats; import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import tconstruct.armor.TinkerArmor; +import tconstruct.armor.player.TPlayerStats; /** * This Packet is for sending the players TPlayerStats from the server to the client. diff --git a/src/main/java/tconstruct/util/network/BeltPacket.java b/src/main/java/tconstruct/util/network/BeltPacket.java index c4215897..7559ef40 100644 --- a/src/main/java/tconstruct/util/network/BeltPacket.java +++ b/src/main/java/tconstruct/util/network/BeltPacket.java @@ -1,13 +1,12 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; -import tconstruct.armor.PlayerAbilityHelper; -import tconstruct.armor.player.TPlayerStats; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import tconstruct.armor.PlayerAbilityHelper; +import tconstruct.armor.player.TPlayerStats; public class BeltPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/DoubleJumpPacket.java b/src/main/java/tconstruct/util/network/DoubleJumpPacket.java index 2d5ac01d..f9504dfc 100644 --- a/src/main/java/tconstruct/util/network/DoubleJumpPacket.java +++ b/src/main/java/tconstruct/util/network/DoubleJumpPacket.java @@ -1,11 +1,10 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; public class DoubleJumpPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/GogglePacket.java b/src/main/java/tconstruct/util/network/GogglePacket.java index 55e944c5..09bd7de0 100644 --- a/src/main/java/tconstruct/util/network/GogglePacket.java +++ b/src/main/java/tconstruct/util/network/GogglePacket.java @@ -1,12 +1,11 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; -import tconstruct.armor.PlayerAbilityHelper; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import tconstruct.armor.PlayerAbilityHelper; public class GogglePacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/HealthUpdatePacket.java b/src/main/java/tconstruct/util/network/HealthUpdatePacket.java index ef882b24..8b34d828 100644 --- a/src/main/java/tconstruct/util/network/HealthUpdatePacket.java +++ b/src/main/java/tconstruct/util/network/HealthUpdatePacket.java @@ -1,13 +1,12 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; -import tconstruct.armor.ArmorProxyClient; -import tconstruct.armor.player.TPlayerStats; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import tconstruct.armor.ArmorProxyClient; +import tconstruct.armor.player.TPlayerStats; public class HealthUpdatePacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/MovementUpdatePacket.java b/src/main/java/tconstruct/util/network/MovementUpdatePacket.java index 0b0c79e6..c5ac84b3 100644 --- a/src/main/java/tconstruct/util/network/MovementUpdatePacket.java +++ b/src/main/java/tconstruct/util/network/MovementUpdatePacket.java @@ -1,12 +1,11 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; public class MovementUpdatePacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index 5a35dee5..7b38e252 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -2,8 +2,6 @@ package tconstruct.util.network; import java.util.*; -import mantle.common.network.*; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.*; import net.minecraft.network.*; @@ -15,6 +13,7 @@ import cpw.mods.fml.relauncher.*; import io.netty.buffer.*; import io.netty.channel.*; import io.netty.handler.codec.MessageToMessageCodec; +import mantle.common.network.*; /** * Packet pipeline class. Directs all registered packet data to be handled by the packets themselves. diff --git a/src/main/java/tconstruct/util/network/PatternTablePacket.java b/src/main/java/tconstruct/util/network/PatternTablePacket.java index 6ed76d88..05bbf640 100644 --- a/src/main/java/tconstruct/util/network/PatternTablePacket.java +++ b/src/main/java/tconstruct/util/network/PatternTablePacket.java @@ -1,17 +1,16 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.network.ByteBufUtils; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; import tconstruct.TConstruct; import tconstruct.library.crafting.StencilBuilder; import tconstruct.tools.inventory.PatternShaperContainer; import tconstruct.tools.logic.StencilTableLogic; -import cpw.mods.fml.common.network.ByteBufUtils; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class PatternTablePacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/SignDataPacket.java b/src/main/java/tconstruct/util/network/SignDataPacket.java index d6d97635..b996e9c7 100644 --- a/src/main/java/tconstruct/util/network/SignDataPacket.java +++ b/src/main/java/tconstruct/util/network/SignDataPacket.java @@ -1,15 +1,14 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import tconstruct.TConstruct; -import tconstruct.tools.logic.BattlesignLogic; import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import tconstruct.TConstruct; +import tconstruct.tools.logic.BattlesignLogic; public class SignDataPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/SmelteryPacket.java b/src/main/java/tconstruct/util/network/SmelteryPacket.java index d4b0ef66..0e01e088 100644 --- a/src/main/java/tconstruct/util/network/SmelteryPacket.java +++ b/src/main/java/tconstruct/util/network/SmelteryPacket.java @@ -1,17 +1,16 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; -import mantle.common.network.PacketUpdateTE; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import mantle.common.network.PacketUpdateTE; import tconstruct.TConstruct; import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.smeltery.logic.SmelteryLogic; -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; public class SmelteryPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/ToolStationPacket.java b/src/main/java/tconstruct/util/network/ToolStationPacket.java index 8ac938f1..09e17a3d 100644 --- a/src/main/java/tconstruct/util/network/ToolStationPacket.java +++ b/src/main/java/tconstruct/util/network/ToolStationPacket.java @@ -1,14 +1,13 @@ package tconstruct.util.network; -import mantle.common.network.AbstractPacket; - import net.minecraft.entity.player.EntityPlayer; -import tconstruct.tools.inventory.ToolStationContainer; -import tconstruct.tools.logic.ToolStationLogic; import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import mantle.common.network.AbstractPacket; +import tconstruct.tools.inventory.ToolStationContainer; +import tconstruct.tools.logic.ToolStationLogic; public class ToolStationPacket extends AbstractPacket { diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java index 674c53aa..0a6e8a35 100644 --- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java +++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java @@ -5,9 +5,6 @@ import static tconstruct.tools.TinkerTools.MaterialID; import java.util.Map; import java.util.Random; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; - import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.IPosition; import net.minecraft.init.Blocks; @@ -20,6 +17,14 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.FMLCommonHandler; +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.registry.GameRegistry; +import mantle.pulsar.pulse.Handler; +import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.*; @@ -52,12 +57,6 @@ import tconstruct.weaponry.items.WeaponryPattern; import tconstruct.weaponry.items.WeaponryPatternClay; import tconstruct.weaponry.weapons.*; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.FMLCommonHandler; -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.registry.GameRegistry; @GameRegistry.ObjectHolder(TConstruct.modID) @Pulse( diff --git a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java index 13a8e7fc..cb9d06fe 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java @@ -2,13 +2,13 @@ package tconstruct.weaponry; import static tconstruct.weaponry.TinkerWeaponry.*; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.client.registry.RenderingRegistry; +import mantle.lib.client.MantleClientRegistry; import tconstruct.client.AmmoItemRenderer; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.ToolBuilder; @@ -24,7 +24,6 @@ import tconstruct.weaponry.client.entity.ProjectileBaseRenderer; import tconstruct.weaponry.client.entity.ShurikenEntityRenderer; import tconstruct.weaponry.client.item.*; import tconstruct.weaponry.entity.*; -import cpw.mods.fml.client.registry.RenderingRegistry; public class WeaponryClientProxy extends WeaponryCommonProxy { diff --git a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java index c06a4a6c..eb436674 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java @@ -1,8 +1,8 @@ package tconstruct.weaponry; +import cpw.mods.fml.common.registry.EntityRegistry; import tconstruct.TConstruct; import tconstruct.weaponry.entity.*; -import cpw.mods.fml.common.registry.EntityRegistry; public class WeaponryCommonProxy { diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java index bb3a7c21..ccbc8120 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryHandler.java +++ b/src/main/java/tconstruct/weaponry/WeaponryHandler.java @@ -10,6 +10,10 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; import tconstruct.armor.player.TPlayerStats; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; @@ -32,10 +36,6 @@ import tconstruct.weaponry.ammo.BoltAmmo; import tconstruct.weaponry.weapons.Crossbow; import tconstruct.weaponry.weapons.LongBow; import tconstruct.weaponry.weapons.ShortBow; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; public class WeaponryHandler { diff --git a/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java b/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java index aea409a0..94f318a7 100644 --- a/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java +++ b/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java @@ -6,8 +6,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderGameOverlayEvent; -import tconstruct.library.weaponry.ProjectileWeapon; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import tconstruct.library.weaponry.ProjectileWeapon; public class AmmoSlotHandler { diff --git a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java index 7e450f6d..4e36945d 100644 --- a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java +++ b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java @@ -10,9 +10,9 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.library.weaponry.IWindup; import tconstruct.util.Reference; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class CrosshairHandler { diff --git a/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java b/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java index fb83a7a1..a315afa7 100644 --- a/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java +++ b/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java @@ -4,9 +4,9 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.FOVUpdateEvent; import net.minecraftforge.client.event.RenderPlayerEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.library.weaponry.BowBaseAmmo; import tconstruct.library.weaponry.IWindup; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class RenderEventHandler { diff --git a/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java b/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java index 25de0a3a..03e1639f 100644 --- a/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import io.netty.buffer.ByteBuf; import tconstruct.library.entity.ProjectileBase; import tconstruct.weaponry.TinkerWeaponry; -import io.netty.buffer.ByteBuf; public class JavelinEntity extends ProjectileBase { diff --git a/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java b/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java index 6c5904f0..dbdafd91 100644 --- a/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java +++ b/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import io.netty.buffer.ByteBuf; import tconstruct.library.entity.ProjectileBase; import tconstruct.weaponry.TinkerWeaponry; -import io.netty.buffer.ByteBuf; public class ShurikenEntity extends ProjectileBase { diff --git a/src/main/java/tconstruct/weaponry/items/Boneana.java b/src/main/java/tconstruct/weaponry/items/Boneana.java index fb8b7ea8..cc3a1002 100644 --- a/src/main/java/tconstruct/weaponry/items/Boneana.java +++ b/src/main/java/tconstruct/weaponry/items/Boneana.java @@ -8,10 +8,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import tconstruct.items.tools.Broadsword; -import tconstruct.util.Reference; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.items.tools.Broadsword; +import tconstruct.util.Reference; public class Boneana extends Broadsword { diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index f205d19a..e4322fc1 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -2,8 +2,6 @@ package tconstruct.weaponry.weapons; import java.util.List; -import mods.battlegear2.api.core.InventoryPlayerBattle; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; @@ -13,6 +11,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.common.Loader; +import mods.battlegear2.api.core.InventoryPlayerBattle; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.AbilityHelper; @@ -24,7 +24,6 @@ import tconstruct.util.Reference; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.ammo.BoltAmmo; import tconstruct.weaponry.entity.BoltEntity; -import cpw.mods.fml.common.Loader; public class Crossbow extends ProjectileWeapon { diff --git a/src/main/java/tconstruct/weaponry/weapons/Javelin.java b/src/main/java/tconstruct/weaponry/weapons/Javelin.java index d7198f41..e529f2ae 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Javelin.java +++ b/src/main/java/tconstruct/weaponry/weapons/Javelin.java @@ -7,14 +7,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.client.CrosshairType; import tconstruct.weaponry.entity.JavelinEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Javelin extends AmmoWeapon { diff --git a/src/main/java/tconstruct/weaponry/weapons/ShortBow.java b/src/main/java/tconstruct/weaponry/weapons/ShortBow.java index 922118d9..5865d26d 100644 --- a/src/main/java/tconstruct/weaponry/weapons/ShortBow.java +++ b/src/main/java/tconstruct/weaponry/weapons/ShortBow.java @@ -8,11 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tconstruct.library.weaponry.BowBaseAmmo; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.ammo.ArrowAmmo; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ShortBow extends BowBaseAmmo { diff --git a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java index 77d67b50..e54b2894 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java +++ b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java @@ -12,13 +12,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tconstruct.client.IconFlipped; import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.weaponry.client.CrosshairType; import tconstruct.weaponry.entity.ShurikenEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class Shuriken extends AmmoWeapon { diff --git a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java index 2ec0ff4d..b5109266 100644 --- a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java +++ b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java @@ -7,13 +7,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import tconstruct.library.entity.ProjectileBase; import tconstruct.library.weaponry.AmmoWeapon; import tconstruct.tools.TinkerTools; import tconstruct.weaponry.client.CrosshairType; import tconstruct.weaponry.entity.ThrowingKnifeEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ThrowingKnife extends AmmoWeapon { diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java index ed893a8a..040b2432 100644 --- a/src/main/java/tconstruct/world/TinkerWorld.java +++ b/src/main/java/tconstruct/world/TinkerWorld.java @@ -1,8 +1,5 @@ package tconstruct.world; -import mantle.pulsar.pulse.*; -import mantle.utils.RecipeRemover; - import net.minecraft.block.*; import net.minecraft.block.Block.SoundType; import net.minecraft.block.material.Material; @@ -17,6 +14,13 @@ import net.minecraftforge.common.*; import net.minecraftforge.fluids.*; import net.minecraftforge.oredict.*; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; +import mantle.pulsar.pulse.*; +import mantle.utils.RecipeRemover; import tconstruct.TConstruct; import tconstruct.armor.TinkerArmor; import tconstruct.blocks.SlabBase; @@ -38,11 +42,6 @@ import tconstruct.world.entity.*; import tconstruct.world.gen.*; import tconstruct.world.itemblocks.*; import tconstruct.world.items.*; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' World", description = "Ores, slime islands, essence berries, and the like.", forced = true) diff --git a/src/main/java/tconstruct/world/TinkerWorldEvents.java b/src/main/java/tconstruct/world/TinkerWorldEvents.java index 175d7dda..17da60d8 100644 --- a/src/main/java/tconstruct/world/TinkerWorldEvents.java +++ b/src/main/java/tconstruct/world/TinkerWorldEvents.java @@ -11,11 +11,11 @@ import net.minecraft.world.World; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.BonemealEvent; +import cpw.mods.fml.common.eventhandler.*; import tconstruct.TConstruct; import tconstruct.tools.TinkerTools; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; -import cpw.mods.fml.common.eventhandler.*; public class TinkerWorldEvents { diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java index 03ee305c..5d5ad630 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java @@ -1,7 +1,5 @@ package tconstruct.world; -import mantle.lib.client.MantleClientRegistry; - import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelSlime; @@ -10,12 +8,13 @@ import net.minecraft.init.*; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.VillagerRegistry; +import mantle.lib.client.MantleClientRegistry; import tconstruct.mechworks.model.CartRender; import tconstruct.tools.TinkerTools; import tconstruct.world.entity.*; import tconstruct.world.model.*; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.VillagerRegistry; public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { diff --git a/src/main/java/tconstruct/world/blocks/ConveyorBase.java b/src/main/java/tconstruct/world/blocks/ConveyorBase.java index b77c6fbc..7bb507e2 100644 --- a/src/main/java/tconstruct/world/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/world/blocks/ConveyorBase.java @@ -1,7 +1,5 @@ package tconstruct.world.blocks; -import mantle.blocks.MantleBlock; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.*; @@ -10,9 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.world.model.SlimeChannelRender; -import cpw.mods.fml.relauncher.*; public class ConveyorBase extends MantleBlock { diff --git a/src/main/java/tconstruct/world/blocks/GravelOre.java b/src/main/java/tconstruct/world/blocks/GravelOre.java index 631c54d4..4518651d 100644 --- a/src/main/java/tconstruct/world/blocks/GravelOre.java +++ b/src/main/java/tconstruct/world/blocks/GravelOre.java @@ -10,9 +10,9 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.relauncher.*; public class GravelOre extends BlockSand { diff --git a/src/main/java/tconstruct/world/blocks/MeatBlock.java b/src/main/java/tconstruct/world/blocks/MeatBlock.java index 76500acf..98a70d80 100644 --- a/src/main/java/tconstruct/world/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/world/blocks/MeatBlock.java @@ -9,8 +9,8 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.*; +import tconstruct.library.TConstructRegistry; public class MeatBlock extends BlockWood { diff --git a/src/main/java/tconstruct/world/blocks/OreberryBush.java b/src/main/java/tconstruct/world/blocks/OreberryBush.java index d5269ad6..07cf1fb3 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBush.java @@ -16,11 +16,11 @@ import net.minecraft.world.*; import net.minecraftforge.common.*; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.world.TinkerWorld; import tconstruct.world.model.OreberryRender; -import cpw.mods.fml.relauncher.*; public class OreberryBush extends BlockLeavesBase implements IPlantable { diff --git a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java index e8fbea1d..037c1216 100644 --- a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java @@ -2,8 +2,6 @@ package tconstruct.world.blocks; import java.util.List; -import mantle.world.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -15,9 +13,10 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; +import mantle.world.WorldHelper; import tconstruct.blocks.TConstructBlock; import tconstruct.mechworks.entity.item.ExplosivePrimed; -import cpw.mods.fml.relauncher.*; public class SlimeExplosive extends TConstructBlock { diff --git a/src/main/java/tconstruct/world/blocks/SlimePad.java b/src/main/java/tconstruct/world/blocks/SlimePad.java index 1605b358..86d678d4 100644 --- a/src/main/java/tconstruct/world/blocks/SlimePad.java +++ b/src/main/java/tconstruct/world/blocks/SlimePad.java @@ -1,7 +1,5 @@ package tconstruct.world.blocks; -import mantle.blocks.MantleBlock; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.*; @@ -10,10 +8,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; import tconstruct.world.model.SlimePadRender; -import cpw.mods.fml.relauncher.*; public class SlimePad extends MantleBlock { diff --git a/src/main/java/tconstruct/world/blocks/SoilSlab.java b/src/main/java/tconstruct/world/blocks/SoilSlab.java index 659762a0..3b24bd2b 100644 --- a/src/main/java/tconstruct/world/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/world/blocks/SoilSlab.java @@ -10,10 +10,10 @@ import net.minecraft.item.*; import net.minecraft.util.IIcon; import net.minecraft.world.*; +import cpw.mods.fml.relauncher.*; import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; -import cpw.mods.fml.relauncher.*; public class SoilSlab extends SlabBase { diff --git a/src/main/java/tconstruct/world/blocks/StoneTorch.java b/src/main/java/tconstruct/world/blocks/StoneTorch.java index 7f3b0ceb..5a468013 100644 --- a/src/main/java/tconstruct/world/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/world/blocks/StoneTorch.java @@ -4,8 +4,6 @@ import static net.minecraftforge.common.util.ForgeDirection.*; import java.util.Random; -import mantle.blocks.MantleBlock; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +12,7 @@ import net.minecraft.util.*; import net.minecraft.world.World; import cpw.mods.fml.relauncher.*; +import mantle.blocks.MantleBlock; public class StoneTorch extends MantleBlock { diff --git a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java index a1dd905f..4e5d2db5 100644 --- a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java @@ -11,10 +11,10 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; import net.minecraft.world.gen.feature.WorldGenerator; +import cpw.mods.fml.common.IWorldGenerator; import tconstruct.tools.TinkerTools; import tconstruct.util.config.*; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.IWorldGenerator; public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { diff --git a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java index 95b0b990..db818263 100644 --- a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java +++ b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java @@ -9,9 +9,9 @@ import net.minecraft.world.*; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; +import cpw.mods.fml.common.IWorldGenerator; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.IWorldGenerator; public class TBaseWorldGenerator implements IWorldGenerator { diff --git a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java index aa3b914d..daffa5b9 100644 --- a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java @@ -9,12 +9,12 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; +import com.google.common.collect.*; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; -import com.google.common.collect.*; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - public class TerrainGenEventHandler { private final SurfaceOreGen ironSurface = new SurfaceOreGen(TinkerWorld.oreGravel, 0, 12, true); diff --git a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java index b71ab97a..a32c4a05 100644 --- a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java @@ -2,14 +2,13 @@ package tconstruct.world.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.MultiItemBlock; public class CraftedSoilItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java b/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java index 4500c6a7..c253b607 100644 --- a/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java +++ b/src/main/java/tconstruct/world/itemblocks/GravelOreItem.java @@ -1,9 +1,9 @@ package tconstruct.world.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class GravelOreItem extends MultiItemBlock { public static final String[] blockTypes = { "iron", "gold", "copper", "tin", "aluminum", "cobalt" }; diff --git a/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java index 9304e5ff..ae6f6dd9 100644 --- a/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/MetalOreItemBlock.java @@ -2,13 +2,13 @@ package tconstruct.world.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import mantle.blocks.abstracts.MultiItemBlock; + public class MetalOreItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "NetherSlag", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag" }; diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java index c348b811..ed8dbb9b 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java @@ -2,9 +2,6 @@ package tconstruct.world.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; -import mantle.world.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,8 +9,10 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.world.TinkerWorld; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.MultiItemBlock; +import mantle.world.WorldHelper; +import tconstruct.world.TinkerWorld; public class OreberryBushItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java index b3985b3a..e7f2a179 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java @@ -2,9 +2,6 @@ package tconstruct.world.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; -import mantle.world.WorldHelper; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,8 +9,10 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import tconstruct.world.TinkerWorld; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.MultiItemBlock; +import mantle.world.WorldHelper; +import tconstruct.world.TinkerWorld; public class OreberryBushSecondItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java index a8305f5a..5aca536b 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeGelItemBlock.java @@ -1,9 +1,9 @@ package tconstruct.world.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class SlimeGelItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "blue", "green", "purple", "magma", "yellow", "red", "metal" }; diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java index 0239aa65..5ca453e2 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeGrassItemBlock.java @@ -1,9 +1,9 @@ package tconstruct.world.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class SlimeGrassItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "blue", "dirt" }; diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java index 765cca8f..abb662f5 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeLeavesItemBlock.java @@ -1,9 +1,9 @@ package tconstruct.world.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class SlimeLeavesItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "blue" }; diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java b/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java index 24077118..c302cd59 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeSaplingItemBlock.java @@ -1,9 +1,9 @@ package tconstruct.world.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; +import mantle.blocks.abstracts.MultiItemBlock; + public class SlimeSaplingItemBlock extends MultiItemBlock { public static final String[] blockTypes = { "bluegreen" }; diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java index 3d6b8817..e7d2e8c6 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java @@ -1,12 +1,11 @@ package tconstruct.world.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.util.*; -import tconstruct.world.TinkerWorld; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.MultiItemBlock; +import tconstruct.world.TinkerWorld; public class SlimeTallGrassItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java index df80c280..631172c9 100644 --- a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java @@ -2,14 +2,13 @@ package tconstruct.world.itemblocks; import java.util.List; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.*; +import mantle.blocks.abstracts.MultiItemBlock; public class SoilSlabItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java index c985e454..4ab5e047 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java @@ -1,7 +1,5 @@ package tconstruct.world.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -9,6 +7,8 @@ import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import mantle.blocks.abstracts.MultiItemBlock; + public class WoolSlab1Item extends MultiItemBlock { Block block; diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java index ac1551f0..b0ee0fa0 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java @@ -1,7 +1,5 @@ package tconstruct.world.itemblocks; -import mantle.blocks.abstracts.MultiItemBlock; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -9,6 +7,8 @@ import net.minecraft.item.*; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import mantle.blocks.abstracts.MultiItemBlock; + public class WoolSlab2Item extends MultiItemBlock { Block block; diff --git a/src/main/java/tconstruct/world/items/OreBerries.java b/src/main/java/tconstruct/world/items/OreBerries.java index 5de7bedc..75134872 100644 --- a/src/main/java/tconstruct/world/items/OreBerries.java +++ b/src/main/java/tconstruct/world/items/OreBerries.java @@ -2,8 +2,6 @@ package tconstruct.world.items; import java.util.List; -import mantle.items.abstracts.CraftingItem; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; @@ -11,8 +9,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.*; +import mantle.items.abstracts.CraftingItem; +import tconstruct.library.TConstructRegistry; public class OreBerries extends CraftingItem { diff --git a/src/main/java/tconstruct/world/model/BarricadeRender.java b/src/main/java/tconstruct/world/model/BarricadeRender.java index 9c3f7177..b4008784 100644 --- a/src/main/java/tconstruct/world/model/BarricadeRender.java +++ b/src/main/java/tconstruct/world/model/BarricadeRender.java @@ -4,8 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import tconstruct.util.ItemHelper; import cpw.mods.fml.client.registry.*; +import tconstruct.util.ItemHelper; public class BarricadeRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/CrystalRender.java b/src/main/java/tconstruct/world/model/CrystalRender.java index 919d49be..039e1a08 100644 --- a/src/main/java/tconstruct/world/model/CrystalRender.java +++ b/src/main/java/tconstruct/world/model/CrystalRender.java @@ -5,8 +5,8 @@ import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.*; import net.minecraft.util.ResourceLocation; -import tconstruct.world.entity.Crystal; import cpw.mods.fml.relauncher.*; +import tconstruct.world.entity.Crystal; @SideOnly(Side.CLIENT) public class CrystalRender extends RenderLiving { diff --git a/src/main/java/tconstruct/world/model/OreberryRender.java b/src/main/java/tconstruct/world/model/OreberryRender.java index 34de6df2..a18f53af 100644 --- a/src/main/java/tconstruct/world/model/OreberryRender.java +++ b/src/main/java/tconstruct/world/model/OreberryRender.java @@ -4,8 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import tconstruct.util.ItemHelper; import cpw.mods.fml.client.registry.*; +import tconstruct.util.ItemHelper; public class OreberryRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/RenderLandmine.java b/src/main/java/tconstruct/world/model/RenderLandmine.java index 1cc597e8..bb899e43 100644 --- a/src/main/java/tconstruct/world/model/RenderLandmine.java +++ b/src/main/java/tconstruct/world/model/RenderLandmine.java @@ -7,8 +7,8 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import tconstruct.mechworks.landmine.Helper; import cpw.mods.fml.client.registry.*; +import tconstruct.mechworks.landmine.Helper; /** * diff --git a/src/main/java/tconstruct/world/model/SlimeChannelRender.java b/src/main/java/tconstruct/world/model/SlimeChannelRender.java index 1f0a86be..6c26dac3 100644 --- a/src/main/java/tconstruct/world/model/SlimeChannelRender.java +++ b/src/main/java/tconstruct/world/model/SlimeChannelRender.java @@ -5,8 +5,8 @@ import net.minecraft.client.renderer.*; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; -import tconstruct.util.ItemHelper; import cpw.mods.fml.client.registry.*; +import tconstruct.util.ItemHelper; public class SlimeChannelRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/SlimePadRender.java b/src/main/java/tconstruct/world/model/SlimePadRender.java index 8cd5703a..dd7ff351 100644 --- a/src/main/java/tconstruct/world/model/SlimePadRender.java +++ b/src/main/java/tconstruct/world/model/SlimePadRender.java @@ -4,11 +4,11 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.*; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.util.ItemHelper; import tconstruct.world.TinkerWorld; import tconstruct.world.blocks.SlimePad; -import cpw.mods.fml.client.registry.*; public class SlimePadRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/SlimeRender.java b/src/main/java/tconstruct/world/model/SlimeRender.java index 1f04ff2e..8cbf94e7 100644 --- a/src/main/java/tconstruct/world/model/SlimeRender.java +++ b/src/main/java/tconstruct/world/model/SlimeRender.java @@ -8,9 +8,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.*; import tconstruct.world.entity.KingBlueSlime; import tconstruct.world.entity.SlimeBase; -import cpw.mods.fml.relauncher.*; @SideOnly(Side.CLIENT) public class SlimeRender extends RenderLiving { diff --git a/src/main/java/tconstruct/world/village/TVillageTrades.java b/src/main/java/tconstruct/world/village/TVillageTrades.java index 1ff76f1d..168c7dc6 100644 --- a/src/main/java/tconstruct/world/village/TVillageTrades.java +++ b/src/main/java/tconstruct/world/village/TVillageTrades.java @@ -7,10 +7,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.village.*; +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import tconstruct.mechworks.TinkerMechworks; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; -import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; public class TVillageTrades implements IVillageTradeHandler {