diff --git a/build.gradle b/build.gradle index f82d369..17e7501 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1681680742 +//version: 1682616243 /* 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,14 +62,14 @@ 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.5' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated @@ -133,7 +129,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') @@ -408,7 +404,7 @@ minecraft { username = developmentEnvironmentUserName.toString() - lwjgl3Version = "3.3.2-SNAPSHOT" + lwjgl3Version = "3.3.2" // Enable assertions in the current mod extraRunJvmArguments.add("-ea:${modGroup}") @@ -722,13 +718,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 +798,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 +807,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 @@ -823,7 +819,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { } } -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 +830,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 +871,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 +886,8 @@ if (usesShadowedDependencies.toBoolean()) { ] archiveClassifier.set('dev') if (relocateShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -1228,7 +1220,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 diff --git a/dependencies.gradle b/dependencies.gradle index 0d1ef84..e2f9b01 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,8 +1,8 @@ // Add your dependencies here dependencies { - compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.42.71:dev' - compile 'com.github.GTNewHorizons:Baubles:1.0.1.14:dev' + compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.43.07:dev' + compile 'com.github.GTNewHorizons:Baubles:1.0.1.16:dev' compile 'net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev' compile 'thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..ccebba7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-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/gradlew b/gradlew index 65dcd68..79a61d4 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/src/main/java/emt/block/BlockElectricCloud.java b/src/main/java/emt/block/BlockElectricCloud.java index f0ee613..31b8e1b 100644 --- a/src/main/java/emt/block/BlockElectricCloud.java +++ b/src/main/java/emt/block/BlockElectricCloud.java @@ -10,12 +10,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import thaumcraft.client.fx.ParticleEngine; -import thaumcraft.client.fx.particles.FXSparkle; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.tile.TileElectricCloud; +import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.fx.particles.FXSparkle; public class BlockElectricCloud extends BlockBase { diff --git a/src/main/java/emt/block/BlockPortableNode.java b/src/main/java/emt/block/BlockPortableNode.java index aad03d1..6d5c401 100644 --- a/src/main/java/emt/block/BlockPortableNode.java +++ b/src/main/java/emt/block/BlockPortableNode.java @@ -10,11 +10,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; -import thaumcraft.common.blocks.BlockAiry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.tile.TileEntityPortableNode; +import thaumcraft.common.blocks.BlockAiry; public class BlockPortableNode extends BlockAiry { diff --git a/src/main/java/emt/command/CommandOutputs.java b/src/main/java/emt/command/CommandOutputs.java index f481292..b1a7557 100644 --- a/src/main/java/emt/command/CommandOutputs.java +++ b/src/main/java/emt/command/CommandOutputs.java @@ -12,9 +12,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import thaumcraft.api.aspects.Aspect; import emt.util.EMTEssentiasOutputs; import emt.util.EMTTextHelper; +import thaumcraft.api.aspects.Aspect; public class CommandOutputs extends CommandBase { diff --git a/src/main/java/emt/entity/EntityEnergyBall.java b/src/main/java/emt/entity/EntityEnergyBall.java index 5e7b0d4..28a2754 100644 --- a/src/main/java/emt/entity/EntityEnergyBall.java +++ b/src/main/java/emt/entity/EntityEnergyBall.java @@ -14,11 +14,11 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import thaumcraft.common.Thaumcraft; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; +import thaumcraft.common.Thaumcraft; public class EntityEnergyBall extends Entity implements IProjectile, IEntityAdditionalSpawnData { diff --git a/src/main/java/emt/gthandler/common/implementations/EssentiaHatch.java b/src/main/java/emt/gthandler/common/implementations/EssentiaHatch.java index 327b035..d948b37 100644 --- a/src/main/java/emt/gthandler/common/implementations/EssentiaHatch.java +++ b/src/main/java/emt/gthandler/common/implementations/EssentiaHatch.java @@ -6,15 +6,16 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; public class EssentiaHatch extends GT_MetaTileEntity_Hatch_Input { @@ -144,12 +145,14 @@ public class EssentiaHatch extends GT_MetaTileEntity_Hatch_Input { } @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection aSide, + ItemStack aStack) { return false; } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection aSide, + ItemStack aStack) { return false; } diff --git a/src/main/java/emt/gthandler/common/implementations/automation/EssentiaFiller.java b/src/main/java/emt/gthandler/common/implementations/automation/EssentiaFiller.java index 1fca258..109149d 100644 --- a/src/main/java/emt/gthandler/common/implementations/automation/EssentiaFiller.java +++ b/src/main/java/emt/gthandler/common/implementations/automation/EssentiaFiller.java @@ -7,15 +7,15 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import emt.gthandler.common.implementations.EssentiaHatch; +import emt.tile.TileEntityEMT; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -import emt.gthandler.common.implementations.EssentiaHatch; -import emt.tile.TileEntityEMT; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public class EssentiaFiller extends TileEntityEMT implements IAspectContainer, IEssentiaTransport { diff --git a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java index befa838..254c39a 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java @@ -9,8 +9,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; import cpw.mods.fml.common.Loader; import emt.gthandler.common.implementations.EssentiaHatch; import emt.gthandler.common.items.EMT_CasingBlock; @@ -23,6 +21,8 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; public class EMT_GT_Loader implements Runnable { diff --git a/src/main/java/emt/gthandler/common/tileentities/machines/multi/DE_Fusion_Crafter.java b/src/main/java/emt/gthandler/common/tileentities/machines/multi/DE_Fusion_Crafter.java index a451774..c1d35d1 100644 --- a/src/main/java/emt/gthandler/common/tileentities/machines/multi/DE_Fusion_Crafter.java +++ b/src/main/java/emt/gthandler/common/tileentities/machines/multi/DE_Fusion_Crafter.java @@ -11,6 +11,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; @@ -138,10 +139,9 @@ public class DE_Fusion_Crafter extends GT_MetaTileEntity_EnhancedMultiBlockBase< return tt; } - @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, - boolean aActive, boolean aRedstone) { - if (aSide == aFacing) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, + int colorIndex, boolean aActive, boolean aRedstone) { + if (side == facing) { if (aActive) return new ITexture[] { TextureFactory.of(MACHINE_CASING_MAGIC), TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE).extFacing().build(), TextureFactory.builder().addIcon(OVERLAY_TELEPORTER_ACTIVE_GLOW).extFacing().glow().build() }; diff --git a/src/main/java/emt/gthandler/common/tileentities/machines/multi/generator/EMT_Large_Essentia_Gen.java b/src/main/java/emt/gthandler/common/tileentities/machines/multi/generator/EMT_Large_Essentia_Gen.java index a164b78..0cef5aa 100644 --- a/src/main/java/emt/gthandler/common/tileentities/machines/multi/generator/EMT_Large_Essentia_Gen.java +++ b/src/main/java/emt/gthandler/common/tileentities/machines/multi/generator/EMT_Large_Essentia_Gen.java @@ -7,10 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.visnet.VisNetHandler; -import thaumcraft.common.config.ConfigBlocks; import emt.gthandler.common.implementations.EssentiaHatch; import emt.gthandler.common.items.EMT_CasingBlock; import emt.util.EMTEssentiasOutputs; @@ -23,6 +19,10 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.objects.XSTR; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.visnet.VisNetHandler; +import thaumcraft.common.config.ConfigBlocks; public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase { @@ -63,9 +63,9 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase { } @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, - boolean aActive, boolean aRedstone) { - if (aSide == aFacing) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, + int colorIndex, boolean aActive, boolean aRedstone) { + if (side == facing) { return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), new GT_RenderedTexture( aActive ? Textures.BlockIcons.OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE @@ -177,8 +177,8 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase { @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack arg1) { - final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 3; - final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 3; + final int xDir = aBaseMetaTileEntity.getBackFacing().offsetX * 3; + final int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ * 3; for (int x = -3; x <= 3; x++) { for (int z = -3; z <= 3; z++) { diff --git a/src/main/java/emt/init/EMTBlocks.java b/src/main/java/emt/init/EMTBlocks.java index c5e4bf8..a1e0610 100644 --- a/src/main/java/emt/init/EMTBlocks.java +++ b/src/main/java/emt/init/EMTBlocks.java @@ -4,8 +4,6 @@ import static thaumcraft.api.ThaumcraftApi.registerObjectTag; import net.minecraft.block.Block; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; import cpw.mods.fml.common.registry.GameRegistry; import emt.block.*; import emt.item.block.ItemBlockElectricCloud; @@ -14,6 +12,8 @@ import emt.item.block.ItemBlockMachines; import emt.item.block.ItemBlockSolars; import emt.tile.solar.Solars; import ic2.api.item.IC2Items; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; public class EMTBlocks { diff --git a/src/main/java/emt/init/EMTItems.java b/src/main/java/emt/init/EMTItems.java index 71a8f84..2915c44 100644 --- a/src/main/java/emt/init/EMTItems.java +++ b/src/main/java/emt/init/EMTItems.java @@ -6,7 +6,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApi; import cpw.mods.fml.common.registry.GameRegistry; import emt.EMT; import emt.item.ItemElectricScribingTools; @@ -39,6 +38,7 @@ import emt.item.tool.omnitool.ItemOmnitoolDiamond; import emt.item.tool.omnitool.ItemOmnitoolIron; import emt.item.tool.omnitool.ItemOmnitoolThaumium; import ic2.core.init.InternalName; +import thaumcraft.api.ThaumcraftApi; public class EMTItems { diff --git a/src/main/java/emt/init/EMTRecipes.java b/src/main/java/emt/init/EMTRecipes.java index 7d7cf61..81e06d9 100644 --- a/src/main/java/emt/init/EMTRecipes.java +++ b/src/main/java/emt/init/EMTRecipes.java @@ -12,15 +12,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.CrucibleRecipe; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.api.crafting.ShapedArcaneRecipe; -import thaumcraft.api.crafting.ShapelessArcaneRecipe; -import thaumcraft.common.blocks.ItemJarNode; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; import cpw.mods.fml.common.registry.GameRegistry; import emt.EMT; import emt.util.EMTConfigHandler; @@ -32,6 +23,15 @@ import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.Recipes; import ic2.core.BasicMachineRecipeManager; import ic2.core.Ic2Items; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.crafting.ShapedArcaneRecipe; +import thaumcraft.api.crafting.ShapelessArcaneRecipe; +import thaumcraft.common.blocks.ItemJarNode; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; public class EMTRecipes { diff --git a/src/main/java/emt/init/EMTResearches.java b/src/main/java/emt/init/EMTResearches.java index 62eeed2..ede16b3 100644 --- a/src/main/java/emt/init/EMTResearches.java +++ b/src/main/java/emt/init/EMTResearches.java @@ -3,13 +3,13 @@ package emt.init; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchPage; import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTResearchAspects; import emt.util.EMTResearchItem; import ic2.api.item.IC2Items; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchPage; public class EMTResearches { diff --git a/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java b/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java index 825cfb5..407eaad 100644 --- a/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java +++ b/src/main/java/emt/init/EMT_GTNH_Recipes_And_Researches.java @@ -14,6 +14,13 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import emt.EMT; +import emt.util.EMTResearchItem; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; @@ -23,13 +30,6 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.crafting.ShapedArcaneRecipe; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import emt.EMT; -import emt.util.EMTResearchItem; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; public class EMT_GTNH_Recipes_And_Researches implements Runnable { diff --git a/src/main/java/emt/item/ItemElectricScribingTools.java b/src/main/java/emt/item/ItemElectricScribingTools.java index b3ed758..76726cc 100644 --- a/src/main/java/emt/item/ItemElectricScribingTools.java +++ b/src/main/java/emt/item/ItemElectricScribingTools.java @@ -8,13 +8,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import thaumcraft.api.IScribeTools; -import thaumcraft.common.items.ItemInkwell; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; +import thaumcraft.api.IScribeTools; +import thaumcraft.common.items.ItemInkwell; public class ItemElectricScribingTools extends ItemInkwell implements IElectricItem, IScribeTools { diff --git a/src/main/java/emt/item/ItemIC2Baubles.java b/src/main/java/emt/item/ItemIC2Baubles.java index dc0c500..660c95c 100644 --- a/src/main/java/emt/item/ItemIC2Baubles.java +++ b/src/main/java/emt/item/ItemIC2Baubles.java @@ -11,7 +11,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import thaumcraft.api.IRunicArmor; import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.relauncher.Side; @@ -20,6 +19,7 @@ import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; +import thaumcraft.api.IRunicArmor; public class ItemIC2Baubles extends ItemBase implements IBauble, IRunicArmor { diff --git a/src/main/java/emt/item/ItemMaterials.java b/src/main/java/emt/item/ItemMaterials.java index b8dda2b..b472652 100644 --- a/src/main/java/emt/item/ItemMaterials.java +++ b/src/main/java/emt/item/ItemMaterials.java @@ -18,11 +18,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowNockEvent; -import thaumcraft.common.config.Config; -import thaumcraft.common.lib.utils.InventoryUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import thaumcraft.common.config.Config; +import thaumcraft.common.lib.utils.InventoryUtils; public class ItemMaterials extends Item { diff --git a/src/main/java/emt/item/ItemOneRing.java b/src/main/java/emt/item/ItemOneRing.java index 54c1dec..27ced0f 100644 --- a/src/main/java/emt/item/ItemOneRing.java +++ b/src/main/java/emt/item/ItemOneRing.java @@ -16,15 +16,15 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; -import thaumcraft.api.IRunicArmor; -import thaumcraft.api.IWarpingGear; -import thaumcraft.api.ThaumcraftApiHelper; import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.util.EMTTextHelper; +import thaumcraft.api.IRunicArmor; +import thaumcraft.api.IWarpingGear; +import thaumcraft.api.ThaumcraftApiHelper; public class ItemOneRing extends ItemBase implements IBauble, IWarpingGear, IRunicArmor { diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index 6955c5c..92b305c 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -18,11 +18,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingFallEvent; -import thaumcraft.api.IRunicArmor; -import thaumcraft.api.IVisDiscountGear; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.items.armor.Hover; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -33,6 +28,11 @@ import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; +import thaumcraft.api.IRunicArmor; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.items.armor.Hover; public class ItemElectricBootsTraveller extends ItemArmor implements IRunicArmor, IElectricItem, IVisDiscountGear, IMetalArmor, ISpecialArmor { diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 0b798e1..7804d21 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -21,7 +21,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingFallEvent; -import thaumcraft.api.IRunicArmor; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -37,6 +36,7 @@ import ic2.core.audio.PositionSpec; import ic2.core.init.InternalName; import ic2.core.item.armor.ItemArmorElectric; import ic2.core.util.StackUtil; +import thaumcraft.api.IRunicArmor; public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements IRunicArmor { diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index 57a8c43..a898892 100644 --- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -15,11 +15,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -import thaumcraft.api.IGoggles; -import thaumcraft.api.IRunicArmor; -import thaumcraft.api.IVisDiscountGear; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.nodes.IRevealer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; @@ -28,6 +23,11 @@ import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; +import thaumcraft.api.IGoggles; +import thaumcraft.api.IRunicArmor; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.nodes.IRevealer; public class ItemElectricGoggles extends ItemArmor implements IRunicArmor, IElectricItem, IVisDiscountGear, IGoggles, IRevealer, IMetalArmor, ISpecialArmor { diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index 1e6ce54..4dde0cc 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import thaumcraft.api.IRunicArmor; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; @@ -19,6 +18,7 @@ import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.core.IC2; import ic2.core.util.StackUtil; +import thaumcraft.api.IRunicArmor; public class ItemFeatherWing extends ItemArmor implements IRunicArmor { diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index 132c6d2..11a9c90 100644 --- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -8,13 +8,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import thaumcraft.api.IRepairable; -import thaumcraft.api.IVisDiscountGear; -import thaumcraft.api.aspects.Aspect; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.util.EMTTextHelper; +import thaumcraft.api.IRepairable; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisDiscountGear, IRepairable { diff --git a/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java index 63c9263..df620f4 100644 --- a/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java +++ b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java @@ -10,11 +10,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; -import thaumcraft.api.aspects.Aspect; import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import emt.util.EMTTextHelper; import gregtech.api.enums.GT_Values; +import thaumcraft.api.aspects.Aspect; public class ItemBlockEssentiaGenerators extends ItemBlock { diff --git a/src/main/java/emt/item/focus/ItemBaseFocus.java b/src/main/java/emt/item/focus/ItemBaseFocus.java index 2773967..348cb14 100644 --- a/src/main/java/emt/item/focus/ItemBaseFocus.java +++ b/src/main/java/emt/item/focus/ItemBaseFocus.java @@ -11,12 +11,12 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.wands.ItemFocusBasic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.ItemFocusBasic; public abstract class ItemBaseFocus extends ItemFocusBasic { diff --git a/src/main/java/emt/item/focus/ItemChargeFocus.java b/src/main/java/emt/item/focus/ItemChargeFocus.java index d421b8a..2a01cf3 100644 --- a/src/main/java/emt/item/focus/ItemChargeFocus.java +++ b/src/main/java/emt/item/focus/ItemChargeFocus.java @@ -7,13 +7,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import emt.util.EMTConfigHandler; +import ic2.api.item.ElectricItem; +import ic2.api.item.IElectricItem; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import emt.util.EMTConfigHandler; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; public class ItemChargeFocus extends ItemBaseFocus { diff --git a/src/main/java/emt/item/focus/ItemExplosionFocus.java b/src/main/java/emt/item/focus/ItemExplosionFocus.java index e907962..da0a584 100644 --- a/src/main/java/emt/item/focus/ItemExplosionFocus.java +++ b/src/main/java/emt/item/focus/ItemExplosionFocus.java @@ -5,11 +5,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import emt.entity.EntityLaser; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import emt.entity.EntityLaser; public class ItemExplosionFocus extends ItemBaseFocus { diff --git a/src/main/java/emt/item/focus/ItemShieldFocus.java b/src/main/java/emt/item/focus/ItemShieldFocus.java index e38bf50..e648ede 100644 --- a/src/main/java/emt/item/focus/ItemShieldFocus.java +++ b/src/main/java/emt/item/focus/ItemShieldFocus.java @@ -8,11 +8,11 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import emt.entity.EntityShield; +import ic2.core.IC2; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import emt.entity.EntityShield; -import ic2.core.IC2; public class ItemShieldFocus extends ItemBaseFocus { diff --git a/src/main/java/emt/item/focus/ItemWandChargingFocus.java b/src/main/java/emt/item/focus/ItemWandChargingFocus.java index 73f89a4..c290d92 100644 --- a/src/main/java/emt/item/focus/ItemWandChargingFocus.java +++ b/src/main/java/emt/item/focus/ItemWandChargingFocus.java @@ -5,12 +5,12 @@ import java.util.Map.Entry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import emt.util.EMTConfigHandler; +import ic2.api.item.ElectricItem; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import emt.util.EMTConfigHandler; -import ic2.api.item.ElectricItem; public class ItemWandChargingFocus extends ItemBaseFocus { diff --git a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java index 0b46dd8..f556c5a 100644 --- a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java +++ b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java @@ -13,15 +13,15 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.blocks.BlockCustomPlant; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.lib.utils.Utils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.blocks.BlockCustomPlant; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.lib.utils.Utils; public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem { diff --git a/src/main/java/emt/item/tool/ItemThorHammer.java b/src/main/java/emt/item/tool/ItemThorHammer.java index 7b638cf..ea7f44f 100644 --- a/src/main/java/emt/item/tool/ItemThorHammer.java +++ b/src/main/java/emt/item/tool/ItemThorHammer.java @@ -16,11 +16,11 @@ import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import thaumcraft.api.IRepairable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.util.EMTTextHelper; +import thaumcraft.api.IRepairable; public class ItemThorHammer extends ItemSword implements IRepairable { diff --git a/src/main/java/emt/item/tool/ItemThorHammerBroken.java b/src/main/java/emt/item/tool/ItemThorHammerBroken.java index 78fc715..f6a8200 100644 --- a/src/main/java/emt/item/tool/ItemThorHammerBroken.java +++ b/src/main/java/emt/item/tool/ItemThorHammerBroken.java @@ -12,12 +12,12 @@ import net.minecraft.world.World; import org.lwjgl.input.Keyboard; -import thaumcraft.api.IRepairable; -import thaumcraft.common.entities.projectile.EntityAlumentum; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.util.EMTTextHelper; +import thaumcraft.api.IRepairable; +import thaumcraft.common.entities.projectile.EntityAlumentum; public class ItemThorHammerBroken extends ItemSword implements IRepairable { diff --git a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java index a0fac67..5e90f7e 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java @@ -10,15 +10,15 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import thaumcraft.common.lib.network.PacketHandler; -import thaumcraft.common.lib.network.fx.PacketFXBlockBubble; -import thaumcraft.common.lib.utils.BlockUtils; -import thaumcraft.common.lib.utils.Utils; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import ic2.api.item.ElectricItem; +import thaumcraft.common.lib.network.PacketHandler; +import thaumcraft.common.lib.network.fx.PacketFXBlockBubble; +import thaumcraft.common.lib.utils.BlockUtils; +import thaumcraft.common.lib.utils.Utils; public class ItemStreamChainsaw extends ItemThaumiumChainsaw { diff --git a/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java b/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java index 46eebce..0433aa4 100644 --- a/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java @@ -23,14 +23,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.event.ForgeEventFactory; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.entities.EntityFollowingItem; -import thaumcraft.common.lib.utils.BlockUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.entities.EntityFollowingItem; +import thaumcraft.common.lib.utils.BlockUtils; public class ItemRockbreakerDrill extends ItemThaumiumDrill { diff --git a/src/main/java/emt/tile/GT_MetaTileEntity_ResearchCompleter.java b/src/main/java/emt/tile/GT_MetaTileEntity_ResearchCompleter.java index 38b94f4..aa174df 100644 --- a/src/main/java/emt/tile/GT_MetaTileEntity_ResearchCompleter.java +++ b/src/main/java/emt/tile/GT_MetaTileEntity_ResearchCompleter.java @@ -11,17 +11,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchItem; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; -import thaumcraft.common.lib.research.ResearchManager; -import thaumcraft.common.lib.research.ResearchNoteData; -import thaumcraft.common.tiles.TileNode; - import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; @@ -37,6 +26,16 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMul import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Utility; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; +import thaumcraft.common.lib.research.ResearchManager; +import thaumcraft.common.lib.research.ResearchNoteData; +import thaumcraft.common.tiles.TileNode; public class GT_MetaTileEntity_ResearchCompleter extends GT_MetaTileEntity_EnhancedMultiBlockBase { @@ -132,9 +131,9 @@ public class GT_MetaTileEntity_ResearchCompleter public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isClientSide()) { if (aBaseMetaTileEntity.isActive()) { - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; - int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY; - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; + int xDir = aBaseMetaTileEntity.getBackFacing().offsetX; + int yDir = aBaseMetaTileEntity.getBackFacing().offsetY; + int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ; double xCoord = aBaseMetaTileEntity.getXCoord() + 0.5; double yCoord = aBaseMetaTileEntity.getYCoord() + 0.5; double zCoord = aBaseMetaTileEntity.getZCoord() + 0.5; @@ -167,9 +166,9 @@ public class GT_MetaTileEntity_ResearchCompleter syncTimer--; IGregTechTileEntity aBaseMetaTileEntity = this.getBaseMetaTileEntity(); - int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; - int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY; - int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; + int xDir = aBaseMetaTileEntity.getBackFacing().offsetX; + int yDir = aBaseMetaTileEntity.getBackFacing().offsetY; + int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ; int i = 1; // Loop through node spaces and drain them from front to back @@ -331,9 +330,9 @@ public class GT_MetaTileEntity_ResearchCompleter } @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, - boolean aActive, boolean aRedstone) { - if (aSide == aFacing) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, + int ColorIndex, boolean aActive, boolean aRedstone) { + if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX), TextureFactory.builder().addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE).extFacing().build(), TextureFactory.builder().addIcon(OVERLAY_FRONT_RESEARCH_COMPLETER_ACTIVE_GLOW).extFacing().glow() diff --git a/src/main/java/emt/tile/TileElectricCloud.java b/src/main/java/emt/tile/TileElectricCloud.java index a7e196b..31c06f2 100644 --- a/src/main/java/emt/tile/TileElectricCloud.java +++ b/src/main/java/emt/tile/TileElectricCloud.java @@ -2,13 +2,13 @@ package emt.tile; import net.minecraft.tileentity.TileEntity; -import thaumcraft.client.fx.ParticleEngine; -import thaumcraft.client.fx.particles.FXWisp; -import thaumcraft.common.Thaumcraft; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import thaumcraft.client.fx.ParticleEngine; +import thaumcraft.client.fx.particles.FXWisp; +import thaumcraft.common.Thaumcraft; public class TileElectricCloud extends TileEntity { diff --git a/src/main/java/emt/tile/TileEntityEtherealMacerator.java b/src/main/java/emt/tile/TileEntityEtherealMacerator.java index 8927faf..bca26bd 100644 --- a/src/main/java/emt/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/emt/tile/TileEntityEtherealMacerator.java @@ -8,8 +8,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.common.config.ConfigItems; - import com.gtnewhorizons.modularui.api.ModularUITextures; import com.gtnewhorizons.modularui.api.forge.InvWrapper; import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; @@ -24,6 +22,7 @@ import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import gregtech.api.gui.modularui.GT_UITextures; import ic2.api.tile.IWrenchable; +import thaumcraft.common.config.ConfigItems; public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable, ITileWithModularUI { diff --git a/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java index 7176789..2cb9326 100644 --- a/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java @@ -8,10 +8,6 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.items.wands.ItemWandCasting; - import com.gtnewhorizons.modularui.api.ModularUITextures; import com.gtnewhorizons.modularui.api.forge.InvWrapper; import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; @@ -27,6 +23,9 @@ import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import ic2.api.energy.tile.IEnergySink; import ic2.api.tile.IWrenchable; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.items.wands.ItemWandCasting; public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory, IWrenchable, IEnergySink, ITileWithModularUI { diff --git a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java index 1f3dc09..b3dafb6 100644 --- a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java @@ -13,11 +13,6 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.*; -import thaumcraft.common.lib.network.PacketHandler; -import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource; - import com.gtnewhorizons.modularui.api.ModularUITextures; import com.gtnewhorizons.modularui.api.drawable.Text; import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; @@ -40,6 +35,10 @@ import gregtech.api.interfaces.tileentity.IEnergyConnected; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.net.GT_Packet_Block_Event; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.*; +import thaumcraft.common.lib.network.PacketHandler; +import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource; public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory, IAspectContainer, IEssentiaTransport, IHasWorldObjectAndCoords, IEnergyConnected, IBasicEnergyContainer, ITileWithModularUI { @@ -397,7 +396,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory if (isUniversalEnergyStored(getOutputVoltage() * getOutputAmperage())) { long tEU = IEnergyConnected.Util.emitEnergyToNetwork(getOutputVoltage(), getOutputAmperage(), this); - drainEnergyUnits((byte) 0, getOutputVoltage(), tEU); + drainEnergyUnits(ForgeDirection.DOWN, getOutputVoltage(), tEU); } } @@ -469,7 +468,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) { + public boolean drainEnergyUnits(ForgeDirection side, long aVoltage, long aAmperage) { return decreaseStoredEnergyUnits( aVoltage * aAmperage, this.energySource.getEnergyStored() > aVoltage * aAmperage); @@ -511,17 +510,17 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) { + public long injectEnergyUnits(ForgeDirection side, long aVoltage, long aAmperage) { return 0L; } @Override - public boolean inputEnergyFrom(byte aSide) { + public boolean inputEnergyFrom(ForgeDirection side) { return false; } @Override - public boolean outputsEnergyTo(byte aSide) { + public boolean outputsEnergyTo(ForgeDirection side) { return true; } @@ -575,22 +574,22 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public TileEntity getTileEntityAtSide(byte aSide) { - if ((aSide < 0) || (aSide >= 6)) { + public TileEntity getTileEntityAtSide(ForgeDirection side) { + if (side == ForgeDirection.UNKNOWN) { return null; } - int tX = getOffsetX(aSide, 1); - int tY = getOffsetY(aSide, 1); - int tZ = getOffsetZ(aSide, 1); + int tX = getOffsetX(side, 1); + int tY = getOffsetY(side, 1); + int tZ = getOffsetZ(side, 1); return this.worldObj.getTileEntity(tX, tY, tZ); } @Override - public TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance) { + public TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int aDistance) { if (aDistance == 1) { - return getTileEntityAtSide(aSide); + return getTileEntityAtSide(side); } - return getTileEntity(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); + return getTileEntity(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance)); } @Override @@ -604,12 +603,12 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public IInventory getIInventoryAtSide(byte aSide) { + public IInventory getIInventoryAtSide(ForgeDirection side) { return null; } @Override - public IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance) { + public IInventory getIInventoryAtSideAndDistance(ForgeDirection side, int aDistance) { return null; } @@ -624,12 +623,12 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public IFluidHandler getITankContainerAtSide(byte aSide) { + public IFluidHandler getITankContainerAtSide(ForgeDirection side) { return null; } @Override - public IFluidHandler getITankContainerAtSideAndDistance(byte aSide, int aDistance) { + public IFluidHandler getITankContainerAtSideAndDistance(ForgeDirection side, int aDistance) { return null; } @@ -648,8 +647,8 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public IGregTechTileEntity getIGregTechTileEntityAtSide(byte aSide) { - TileEntity tTileEntity = getTileEntityAtSide(aSide); + public IGregTechTileEntity getIGregTechTileEntityAtSide(ForgeDirection side) { + TileEntity tTileEntity = getTileEntityAtSide(side); if ((tTileEntity instanceof IGregTechTileEntity)) { return (IGregTechTileEntity) tTileEntity; } @@ -657,8 +656,8 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte aSide, int aDistance) { - TileEntity tTileEntity = getTileEntityAtSideAndDistance(aSide, aDistance); + public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(ForgeDirection side, int aDistance) { + TileEntity tTileEntity = getTileEntityAtSideAndDistance(side, aDistance); if ((tTileEntity instanceof IGregTechTileEntity)) { return (IGregTechTileEntity) tTileEntity; } @@ -676,22 +675,22 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public Block getBlockAtSide(byte aSide) { - if ((aSide < 0) || (aSide >= 6)) { + public Block getBlockAtSide(ForgeDirection side) { + if (side == ForgeDirection.UNKNOWN) { return null; } - int tX = getOffsetX(aSide, 1); - int tY = getOffsetY(aSide, 1); - int tZ = getOffsetZ(aSide, 1); + int tX = getOffsetX(side, 1); + int tY = getOffsetY(side, 1); + int tZ = getOffsetZ(side, 1); return this.worldObj.getBlock(tX, tY, tZ); } @Override - public Block getBlockAtSideAndDistance(byte aSide, int aDistance) { + public Block getBlockAtSideAndDistance(ForgeDirection side, int aDistance) { if (aDistance == 1) { - return getBlockAtSide(aSide); + return getBlockAtSide(side); } - return getBlock(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); + return getBlock(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance)); } @Override @@ -705,19 +704,19 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public byte getMetaIDAtSide(byte aSide) { - int tX = getOffsetX(aSide, 1); - int tY = getOffsetY(aSide, 1); - int tZ = getOffsetZ(aSide, 1); + public byte getMetaIDAtSide(ForgeDirection side) { + int tX = getOffsetX(side, 1); + int tY = getOffsetY(side, 1); + int tZ = getOffsetZ(side, 1); return (byte) this.worldObj.getBlockMetadata(tX, tY, tZ); } @Override - public byte getMetaIDAtSideAndDistance(byte aSide, int aDistance) { + public byte getMetaIDAtSideAndDistance(ForgeDirection side, int aDistance) { if (aDistance == 1) { - return getMetaIDAtSide(aSide); + return getMetaIDAtSide(side); } - return getMetaID(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); + return getMetaID(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance)); } @Override @@ -731,12 +730,12 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public byte getLightLevelAtSide(byte aSide) { + public byte getLightLevelAtSide(ForgeDirection side) { return 0; } @Override - public byte getLightLevelAtSideAndDistance(byte aSide, int aDistance) { + public byte getLightLevelAtSideAndDistance(ForgeDirection side, int aDistance) { return 0; } @@ -751,12 +750,12 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public boolean getOpacityAtSide(byte aSide) { + public boolean getOpacityAtSide(ForgeDirection side) { return false; } @Override - public boolean getOpacityAtSideAndDistance(byte aSide, int aDistance) { + public boolean getOpacityAtSideAndDistance(ForgeDirection side, int aDistance) { return false; } @@ -777,12 +776,12 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public boolean getSkyAtSide(byte aSide) { + public boolean getSkyAtSide(ForgeDirection side) { return false; } @Override - public boolean getSkyAtSideAndDistance(byte aSide, int aDistance) { + public boolean getSkyAtSideAndDistance(ForgeDirection side, int aDistance) { return false; } @@ -797,13 +796,13 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public boolean getAirAtSide(byte aSide) { - return getAirAtSideAndDistance(aSide, 1); + public boolean getAirAtSide(ForgeDirection side) { + return getAirAtSideAndDistance(side, 1); } @Override - public boolean getAirAtSideAndDistance(byte aSide, int aDistance) { - return getAir(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); + public boolean getAirAtSideAndDistance(ForgeDirection side, int aDistance) { + return getAir(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance)); } @Override @@ -817,18 +816,18 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public int getOffsetX(byte aSide, int aMultiplier) { - return this.xCoord + ForgeDirection.getOrientation(aSide).offsetX * aMultiplier; + public int getOffsetX(ForgeDirection side, int aMultiplier) { + return this.xCoord + side.offsetX * aMultiplier; } @Override - public short getOffsetY(byte aSide, int aMultiplier) { - return (short) (this.yCoord + ForgeDirection.getOrientation(aSide).offsetY * aMultiplier); + public short getOffsetY(ForgeDirection side, int aMultiplier) { + return (short) (this.yCoord + side.offsetY * aMultiplier); } @Override - public int getOffsetZ(byte aSide, int aMultiplier) { - return this.zCoord + ForgeDirection.getOrientation(aSide).offsetZ * aMultiplier; + public int getOffsetZ(ForgeDirection side, int aMultiplier) { + return this.zCoord + side.offsetZ * aMultiplier; } @Override @@ -859,12 +858,12 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory } @Override - public boolean outputsEnergyTo(byte b, boolean b1) { + public boolean outputsEnergyTo(ForgeDirection side, boolean b1) { return true; } @Override - public boolean inputEnergyFrom(byte b, boolean b1) { + public boolean inputEnergyFrom(ForgeDirection side, boolean b1) { return false; } diff --git a/src/main/java/emt/tile/generator/TileEntityCompressedGenerator.java b/src/main/java/emt/tile/generator/TileEntityCompressedGenerator.java index 473fb17..ad1051f 100644 --- a/src/main/java/emt/tile/generator/TileEntityCompressedGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityCompressedGenerator.java @@ -1,8 +1,8 @@ package emt.tile.generator; -import thaumcraft.api.aspects.Aspect; import emt.tile.DefinitelyNotAIC2Source; import emt.util.EMTConfigHandler; +import thaumcraft.api.aspects.Aspect; public abstract class TileEntityCompressedGenerator extends TileEntityBaseGenerator { diff --git a/src/main/java/emt/tile/solar/Solars.java b/src/main/java/emt/tile/solar/Solars.java index 5006c5c..a9f9f1a 100644 --- a/src/main/java/emt/tile/solar/Solars.java +++ b/src/main/java/emt/tile/solar/Solars.java @@ -8,11 +8,11 @@ import javax.annotation.Nullable; import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; import emt.init.EMTBlocks; import emt.util.EMTConfigHandler; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import thaumcraft.api.aspects.Aspect; // Solar Factory public enum Solars { diff --git a/src/main/java/emt/tile/solar/TileEntitySolarBase.java b/src/main/java/emt/tile/solar/TileEntitySolarBase.java index da8636e..60a4708 100644 --- a/src/main/java/emt/tile/solar/TileEntitySolarBase.java +++ b/src/main/java/emt/tile/solar/TileEntitySolarBase.java @@ -14,9 +14,6 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.visnet.VisNetHandler; - import com.gtnewhorizons.modularui.api.ModularUITextures; import com.gtnewhorizons.modularui.api.drawable.Text; import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI; @@ -39,6 +36,8 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.net.GT_Packet_Block_Event; import ic2.api.tile.IWrenchable; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.visnet.VisNetHandler; public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IWrenchable, IHasWorldObjectAndCoords, IEnergyConnected, IBasicEnergyContainer, ITileWithModularUI { @@ -389,7 +388,7 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW if (isUniversalEnergyStored(getOutputVoltage() * getOutputAmperage())) { long tEU = IEnergyConnected.Util.emitEnergyToNetwork(getOutputVoltage(), getOutputAmperage(), this); - drainEnergyUnits((byte) 0, getOutputVoltage(), tEU); + drainEnergyUnits(ForgeDirection.DOWN, getOutputVoltage(), tEU); } } @@ -486,7 +485,7 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage) { + public boolean drainEnergyUnits(ForgeDirection side, long aVoltage, long aAmperage) { return decreaseStoredEnergyUnits( aVoltage * aAmperage, this.energySource.getEnergyStored() > aVoltage * aAmperage); @@ -528,17 +527,17 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage) { + public long injectEnergyUnits(ForgeDirection side, long aVoltage, long aAmperage) { return 0L; } @Override - public boolean inputEnergyFrom(byte aSide) { + public boolean inputEnergyFrom(ForgeDirection side) { return false; } @Override - public boolean outputsEnergyTo(byte aSide) { + public boolean outputsEnergyTo(ForgeDirection side) { return true; } @@ -592,22 +591,22 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public TileEntity getTileEntityAtSide(byte aSide) { - if ((aSide < 0) || (aSide >= 6)) { + public TileEntity getTileEntityAtSide(ForgeDirection side) { + if (side == ForgeDirection.UNKNOWN) { return null; } - int tX = getOffsetX(aSide, 1); - int tY = getOffsetY(aSide, 1); - int tZ = getOffsetZ(aSide, 1); + int tX = getOffsetX(side, 1); + int tY = getOffsetY(side, 1); + int tZ = getOffsetZ(side, 1); return this.worldObj.getTileEntity(tX, tY, tZ); } @Override - public TileEntity getTileEntityAtSideAndDistance(byte aSide, int aDistance) { + public TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int aDistance) { if (aDistance == 1) { - return getTileEntityAtSide(aSide); + return getTileEntityAtSide(side); } - return getTileEntity(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); + return getTileEntity(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance)); } @Override @@ -621,12 +620,12 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public IInventory getIInventoryAtSide(byte aSide) { + public IInventory getIInventoryAtSide(ForgeDirection side) { return null; } @Override - public IInventory getIInventoryAtSideAndDistance(byte aSide, int aDistance) { + public IInventory getIInventoryAtSideAndDistance(ForgeDirection side, int aDistance) { return null; } @@ -641,12 +640,12 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public IFluidHandler getITankContainerAtSide(byte aSide) { + public IFluidHandler getITankContainerAtSide(ForgeDirection side) { return null; } @Override - public IFluidHandler getITankContainerAtSideAndDistance(byte aSide, int aDistance) { + public IFluidHandler getITankContainerAtSideAndDistance(ForgeDirection side, int aDistance) { return null; } @@ -665,8 +664,8 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public IGregTechTileEntity getIGregTechTileEntityAtSide(byte aSide) { - TileEntity tTileEntity = getTileEntityAtSide(aSide); + public IGregTechTileEntity getIGregTechTileEntityAtSide(ForgeDirection side) { + TileEntity tTileEntity = getTileEntityAtSide(side); if ((tTileEntity instanceof IGregTechTileEntity)) { return (IGregTechTileEntity) tTileEntity; } @@ -674,8 +673,8 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte aSide, int aDistance) { - TileEntity tTileEntity = getTileEntityAtSideAndDistance(aSide, aDistance); + public IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(ForgeDirection side, int aDistance) { + TileEntity tTileEntity = getTileEntityAtSideAndDistance(side, aDistance); if ((tTileEntity instanceof IGregTechTileEntity)) { return (IGregTechTileEntity) tTileEntity; } @@ -693,22 +692,22 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public Block getBlockAtSide(byte aSide) { - if ((aSide < 0) || (aSide >= 6)) { + public Block getBlockAtSide(ForgeDirection side) { + if (side == ForgeDirection.UNKNOWN) { return null; } - int tX = getOffsetX(aSide, 1); - int tY = getOffsetY(aSide, 1); - int tZ = getOffsetZ(aSide, 1); + int tX = getOffsetX(side, 1); + int tY = getOffsetY(side, 1); + int tZ = getOffsetZ(side, 1); return this.worldObj.getBlock(tX, tY, tZ); } @Override - public Block getBlockAtSideAndDistance(byte aSide, int aDistance) { + public Block getBlockAtSideAndDistance(ForgeDirection side, int aDistance) { if (aDistance == 1) { - return getBlockAtSide(aSide); + return getBlockAtSide(side); } - return getBlock(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); + return getBlock(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance)); } @Override @@ -722,19 +721,19 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public byte getMetaIDAtSide(byte aSide) { - int tX = getOffsetX(aSide, 1); - int tY = getOffsetY(aSide, 1); - int tZ = getOffsetZ(aSide, 1); + public byte getMetaIDAtSide(ForgeDirection side) { + int tX = getOffsetX(side, 1); + int tY = getOffsetY(side, 1); + int tZ = getOffsetZ(side, 1); return (byte) this.worldObj.getBlockMetadata(tX, tY, tZ); } @Override - public byte getMetaIDAtSideAndDistance(byte aSide, int aDistance) { + public byte getMetaIDAtSideAndDistance(ForgeDirection side, int aDistance) { if (aDistance == 1) { - return getMetaIDAtSide(aSide); + return getMetaIDAtSide(side); } - return getMetaID(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); + return getMetaID(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance)); } @Override @@ -748,12 +747,12 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public byte getLightLevelAtSide(byte aSide) { + public byte getLightLevelAtSide(ForgeDirection side) { return 0; } @Override - public byte getLightLevelAtSideAndDistance(byte aSide, int aDistance) { + public byte getLightLevelAtSideAndDistance(ForgeDirection side, int aDistance) { return 0; } @@ -768,12 +767,12 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public boolean getOpacityAtSide(byte aSide) { + public boolean getOpacityAtSide(ForgeDirection side) { return false; } @Override - public boolean getOpacityAtSideAndDistance(byte aSide, int aDistance) { + public boolean getOpacityAtSideAndDistance(ForgeDirection side, int aDistance) { return false; } @@ -794,12 +793,12 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public boolean getSkyAtSide(byte aSide) { + public boolean getSkyAtSide(ForgeDirection side) { return false; } @Override - public boolean getSkyAtSideAndDistance(byte aSide, int aDistance) { + public boolean getSkyAtSideAndDistance(ForgeDirection side, int aDistance) { return false; } @@ -814,13 +813,13 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public boolean getAirAtSide(byte aSide) { - return getAirAtSideAndDistance(aSide, 1); + public boolean getAirAtSide(ForgeDirection side) { + return getAirAtSideAndDistance(side, 1); } @Override - public boolean getAirAtSideAndDistance(byte aSide, int aDistance) { - return getAir(getOffsetX(aSide, aDistance), getOffsetY(aSide, aDistance), getOffsetZ(aSide, aDistance)); + public boolean getAirAtSideAndDistance(ForgeDirection side, int aDistance) { + return getAir(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance)); } @Override @@ -834,18 +833,18 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public int getOffsetX(byte aSide, int aMultiplier) { - return this.xCoord + ForgeDirection.getOrientation(aSide).offsetX * aMultiplier; + public int getOffsetX(ForgeDirection side, int aMultiplier) { + return this.xCoord + side.offsetX * aMultiplier; } @Override - public short getOffsetY(byte aSide, int aMultiplier) { - return (short) (this.yCoord + ForgeDirection.getOrientation(aSide).offsetY * aMultiplier); + public short getOffsetY(ForgeDirection side, int aMultiplier) { + return (short) (this.yCoord + side.offsetY * aMultiplier); } @Override - public int getOffsetZ(byte aSide, int aMultiplier) { - return this.zCoord + ForgeDirection.getOrientation(aSide).offsetZ * aMultiplier; + public int getOffsetZ(ForgeDirection side, int aMultiplier) { + return this.zCoord + side.offsetZ * aMultiplier; } @Override @@ -876,12 +875,12 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW } @Override - public boolean outputsEnergyTo(byte b, boolean b1) { + public boolean outputsEnergyTo(ForgeDirection b, boolean b1) { return true; } @Override - public boolean inputEnergyFrom(byte b, boolean b1) { + public boolean inputEnergyFrom(ForgeDirection b, boolean b1) { return false; } diff --git a/src/main/java/emt/util/EMTEventHandler.java b/src/main/java/emt/util/EMTEventHandler.java index 8eeeabf..da067a9 100644 --- a/src/main/java/emt/util/EMTEventHandler.java +++ b/src/main/java/emt/util/EMTEventHandler.java @@ -12,8 +12,6 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.entities.monster.EntityTaintChicken; import baubles.api.BaublesApi; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -24,6 +22,8 @@ import emt.init.EMTBlocks; import emt.init.EMTItems; import emt.item.armor.wings.ItemFeatherWing; import ic2.api.item.ElectricItem; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.entities.monster.EntityTaintChicken; public class EMTEventHandler { diff --git a/src/main/java/emt/util/EMTResearchItem.java b/src/main/java/emt/util/EMTResearchItem.java index a3f2c7f..f7d2044 100644 --- a/src/main/java/emt/util/EMTResearchItem.java +++ b/src/main/java/emt/util/EMTResearchItem.java @@ -3,12 +3,12 @@ package emt.util; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; import thaumcraft.api.research.ResearchPage.PageType; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class EMTResearchItem extends ResearchItem {