From 7b08cb8f7715febabe1c69b42f218a6c019cc30d Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 1 May 2023 02:44:51 -0700 Subject: Forge direction (#199) * ForgeDirection * spotlessApply --------- Co-authored-by: GitHub GTNH Actions --- build.gradle | 48 +++++++--------- dependencies.gradle | 2 +- .../tectech/compatibility/gtpp/GtppAtomLoader.java | 1 + .../openComputers/AvrArchitecture.java | 20 +++---- .../blocks/turretbases/TurretBaseEM.java | 6 +- .../blocks/turretheads/TurretHeadEM.java | 4 +- .../blocks/turretheads/TurretHeadItemRenderEM.java | 4 +- .../entity/projectiles/projectileEM.java | 13 ++--- .../tileentity/turret/TileTurretHeadEM.java | 10 ++-- .../tileentity/turretbase/TileTurretBaseEM.java | 3 +- .../AspectDefinitionCompatEnabled.java | 4 +- .../multi/EssentiaCompatEnabled.java | 6 +- .../GT_MetaTileEntity_EM_essentiaDequantizer.java | 3 +- .../technus/tectech/loader/EntityLoader.java | 1 + .../technus/tectech/loader/gui/ModGuiHandler.java | 1 + .../tectech/loader/recipe/MachineEMBehaviours.java | 1 + .../loader/recipe/ResearchStationAssemblyLine.java | 5 +- .../tectech/mechanics/avr/SidedRedstone.java | 17 +++--- .../core/maps/EMInstanceStackMap.java | 1 + .../mechanics/pipe/IConnectsToDataPipe.java | 6 +- .../mechanics/pipe/IConnectsToElementalPipe.java | 4 +- .../mechanics/pipe/IConnectsToEnergyTunnel.java | 4 +- .../tectech/mechanics/spark/RendererMessage.java | 2 +- .../mechanics/tesla/TeslaCoverConnection.java | 5 +- .../github/technus/tectech/nei/NEI_TT_Config.java | 4 +- .../tectech/nei/TT_NEI_ResearchHandler.java | 9 ++- .../technus/tectech/nei/TT_NEI_ScannerHandler.java | 9 ++- .../github/technus/tectech/proxy/ClientProxy.java | 26 ++++----- .../github/technus/tectech/proxy/CommonProxy.java | 5 +- .../technus/tectech/recipe/EyeOfHarmonyRecipe.java | 7 +-- .../tectech/recipe/EyeOfHarmonyRecipeStorage.java | 11 ++-- .../github/technus/tectech/recipe/TT_recipe.java | 5 +- .../tectech/thing/block/QuantumStuffRender.java | 1 + .../tectech/thing/casing/GT_Block_CasingsBA0.java | 24 ++++---- .../tectech/thing/casing/GT_Block_CasingsNH.java | 6 +- .../tectech/thing/casing/GT_Block_CasingsTT.java | 16 +++--- .../casing/SpacetimeCompressionFieldCasing.java | 6 +- .../thing/casing/StabilisationFieldCasing.java | 6 +- .../thing/casing/TimeAccelerationFieldCasing.java | 6 +- .../thing/cover/GT_Cover_TM_EnderFluidLink.java | 29 +++++----- .../thing/cover/GT_Cover_TM_PowerPassUpgrade.java | 11 ++-- .../tectech/thing/cover/GT_Cover_TM_TeslaCoil.java | 17 +++--- .../cover/GT_Cover_TM_TeslaCoil_Ultimate.java | 15 +++-- .../item/DebugElementalInstanceContainer_EM.java | 2 +- .../technus/tectech/thing/item/EuMeterGT.java | 12 ++-- .../tectech/thing/item/ParametrizerMemoryCard.java | 2 +- .../hatch/GT_MetaTileEntity_Hatch_Capacitor.java | 13 +++-- .../GT_MetaTileEntity_Hatch_CreativeData.java | 19 +++--- ...T_MetaTileEntity_Hatch_CreativeMaintenance.java | 11 ++-- .../GT_MetaTileEntity_Hatch_DataConnector.java | 11 ++-- .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 13 +++-- .../GT_MetaTileEntity_Hatch_DynamoTunnel.java | 19 +++--- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 15 +++-- .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 13 +++-- .../GT_MetaTileEntity_Hatch_EnergyTunnel.java | 15 +++-- .../hatch/GT_MetaTileEntity_Hatch_Holder.java | 15 +++-- .../hatch/GT_MetaTileEntity_Hatch_InputData.java | 11 ++-- .../GT_MetaTileEntity_Hatch_InputDataItems.java | 19 +++--- .../GT_MetaTileEntity_Hatch_InputElemental.java | 10 ++-- .../hatch/GT_MetaTileEntity_Hatch_OutputData.java | 19 +++--- .../GT_MetaTileEntity_Hatch_OutputDataItems.java | 22 +++---- .../GT_MetaTileEntity_Hatch_OutputElemental.java | 15 ++--- .../GT_MetaTileEntity_Hatch_OverflowElemental.java | 14 +++-- .../hatch/GT_MetaTileEntity_Hatch_Param.java | 11 ++-- .../hatch/GT_MetaTileEntity_Hatch_ParamText.java | 11 ++-- .../hatch/GT_MetaTileEntity_Hatch_Rack.java | 15 +++-- .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java | 11 ++-- .../GT_MetaTileEntity_Hatch_WirelessMulti.java | 13 +++-- .../multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 12 ++-- .../multi/GT_MetaTileEntity_EM_annihilation.java | 7 ++- .../multi/GT_MetaTileEntity_EM_bhg.java | 7 ++- .../multi/GT_MetaTileEntity_EM_computer.java | 7 ++- .../multi/GT_MetaTileEntity_EM_crafting.java | 7 ++- .../multi/GT_MetaTileEntity_EM_dataBank.java | 7 ++- .../multi/GT_MetaTileEntity_EM_decay.java | 7 ++- .../multi/GT_MetaTileEntity_EM_infuser.java | 3 +- .../multi/GT_MetaTileEntity_EM_junction.java | 3 +- .../multi/GT_MetaTileEntity_EM_research.java | 12 ++-- .../multi/GT_MetaTileEntity_EM_scanner.java | 10 +--- .../multi/GT_MetaTileEntity_EM_switch.java | 7 ++- .../multi/GT_MetaTileEntity_EM_transformer.java | 7 ++- .../multi/GT_MetaTileEntity_EM_wormhole.java | 7 ++- .../multi/GT_MetaTileEntity_TM_microwave.java | 9 +-- .../GT_MetaTileEntity_TM_proccessingStack.java | 6 +- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 9 +-- .../base/GT_MetaTileEntity_MultiblockBase_EM.java | 11 ++-- .../em_collider/GT_MetaTileEntity_EM_collider.java | 26 ++++----- .../em_machine/GT_MetaTileEntity_EM_machine.java | 10 +--- .../pipe/GT_MetaTileEntity_Pipe_Data.java | 67 +++++++++++----------- .../pipe/GT_MetaTileEntity_Pipe_EM.java | 43 +++++++------- .../pipe/GT_MetaTileEntity_Pipe_Energy.java | 44 +++++++------- .../single/GT_MetaTileEntity_BuckConverter.java | 28 ++++----- .../single/GT_MetaTileEntity_DataReader.java | 29 +++++----- .../single/GT_MetaTileEntity_DebugPollutor.java | 25 ++++---- .../GT_MetaTileEntity_DebugPowerGenerator.java | 33 ++++++----- .../GT_MetaTileEntity_DebugStructureWriter.java | 22 +++---- .../single/GT_MetaTileEntity_MicroController.java | 27 +++++---- .../single/GT_MetaTileEntity_OwnerDetector.java | 25 ++++---- .../single/GT_MetaTileEntity_TeslaCoil.java | 23 ++++---- 99 files changed, 671 insertions(+), 584 deletions(-) diff --git a/build.gradle b/build.gradle index 74899dc97b..17e7501a27 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1682104756 +//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.7' + 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 8e9a85f350..8b3a8d99e5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.71:dev") + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.02-pre:dev') api('com.github.GTNewHorizons:Yamcl:0.5.86:dev') api('com.github.GTNewHorizons:ModularUI:1.1.2:dev') implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.0.29:dev') diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java index c3758674f5..c7f7574d21 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java @@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack; import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry; + import gregtech.api.enums.OrePrefixes; public class GtppAtomLoader { diff --git a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java index 6b3d313eb3..bb745216d3 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java @@ -6,16 +6,6 @@ import java.io.IOException; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import li.cil.oc.Settings; -import li.cil.oc.api.Driver; -import li.cil.oc.api.driver.Item; -import li.cil.oc.api.driver.item.Memory; -import li.cil.oc.api.machine.Architecture; -import li.cil.oc.api.machine.ExecutionResult; -import li.cil.oc.api.machine.Machine; -import li.cil.oc.api.machine.Signal; -import li.cil.oc.common.SaveHandler; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,6 +22,16 @@ import com.github.technus.avrClone.memory.program.ProgramMemory; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.util.Converter; +import li.cil.oc.Settings; +import li.cil.oc.api.Driver; +import li.cil.oc.api.driver.Item; +import li.cil.oc.api.driver.item.Memory; +import li.cil.oc.api.machine.Architecture; +import li.cil.oc.api.machine.ExecutionResult; +import li.cil.oc.api.machine.Machine; +import li.cil.oc.api.machine.Signal; +import li.cil.oc.common.SaveHandler; + @Architecture.Name("AVR 32Bit Clone") @Architecture.NoMemoryRequirements public class AvrArchitecture implements Architecture { diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java index 792b09745e..6da5055e08 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java @@ -7,12 +7,12 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import openmodularturrets.blocks.turretbases.BlockAbstractTurretBase; -import openmodularturrets.handler.ConfigHandler; - import com.github.technus.tectech.Reference; import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM; + import cpw.mods.fml.common.registry.GameRegistry; +import openmodularturrets.blocks.turretbases.BlockAbstractTurretBase; +import openmodularturrets.handler.ConfigHandler; /** * Created by Tec on 27/07/2017. diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java index d3bec80f29..b410f483c1 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java @@ -10,10 +10,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import openmodularturrets.tileentity.turretbase.TurretBase; - import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; + import cpw.mods.fml.common.registry.GameRegistry; +import openmodularturrets.tileentity.turretbase.TurretBase; /** * Created by Tec on 27/07/2017. diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java index b2f0854340..4fdc413261 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java @@ -3,12 +3,12 @@ package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turre import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; -import openmodularturrets.client.render.models.ModelLaserTurret; - import org.lwjgl.opengl.GL11; import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM; +import openmodularturrets.client.render.models.ModelLaserTurret; + /** * Created by Tec on 30.07.2017. */ diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java index fdffd31001..eec1121fff 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java @@ -5,19 +5,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import openmodularturrets.entity.projectiles.LaserProjectile; -import openmodularturrets.entity.projectiles.damagesources.NormalDamageSource; -import openmodularturrets.handler.ConfigHandler; -import openmodularturrets.tileentity.turretbase.TurretBase; -import openmodularturrets.util.PlayerUtil; -import openmodularturrets.util.TurretHeadUtil; - import com.github.technus.tectech.TecTech; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition; import gregtech.api.enums.SoundResource; import gregtech.api.util.GT_Utility; +import openmodularturrets.entity.projectiles.LaserProjectile; +import openmodularturrets.entity.projectiles.damagesources.NormalDamageSource; +import openmodularturrets.handler.ConfigHandler; +import openmodularturrets.tileentity.turretbase.TurretBase; +import openmodularturrets.util.PlayerUtil; +import openmodularturrets.util.TurretHeadUtil; /** * Created by Bass on 27/07/2017. diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java index 631e7306cb..62177c16db 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java @@ -7,17 +7,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import openmodularturrets.entity.projectiles.TurretProjectile; -import openmodularturrets.handler.ConfigHandler; -import openmodularturrets.tileentity.turrets.TurretHead; -import openmodularturrets.util.TurretHeadUtil; - import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM; import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; +import openmodularturrets.entity.projectiles.TurretProjectile; +import openmodularturrets.handler.ConfigHandler; +import openmodularturrets.tileentity.turrets.TurretHead; +import openmodularturrets.util.TurretHeadUtil; + /** * Created by Bass on 27/07/2017. */ diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java index d03f57bb76..023249a80a 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java +++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java @@ -3,14 +3,13 @@ package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.t import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import openmodularturrets.tileentity.turretbase.TurretBaseTierFiveTileEntity; - import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental; import cpw.mods.fml.common.Optional; import gregtech.api.enums.Mods; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import openmodularturrets.tileentity.turretbase.TurretBaseTierFiveTileEntity; /** * Created by Bass on 27/07/2017. diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java index 09014b8b8e..2d606790bd 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java @@ -9,13 +9,13 @@ import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatte import java.util.ArrayList; -import thaumcraft.api.aspects.Aspect; - import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.EMException; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry; +import thaumcraft.api.aspects.Aspect; + /** * Created by Tec on 21.05.2017. */ diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java index 05d85f9209..5e0a71f897 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java @@ -4,15 +4,15 @@ import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatte import net.minecraft.tileentity.TileEntity; +import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; +import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.common.tiles.TileEssentiaReservoir; import thaumcraft.common.tiles.TileJarFillable; -import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; - /** * Created by Tec on 21.05.2017. */ diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java index cca35ad12e..c356c4e216 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java @@ -18,8 +18,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.Aspect; - import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack; import com.github.technus.tectech.thing.block.QuantumGlassBlock; @@ -35,6 +33,7 @@ import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import thaumcraft.api.aspects.Aspect; /** * Created by danie_000 on 17.12.2016. diff --git a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java index 17eb7ff845..0c43f37636 100644 --- a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java @@ -4,6 +4,7 @@ import static gregtech.api.enums.Mods.OpenModularTurrets; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM; + import cpw.mods.fml.common.registry.EntityRegistry; /** diff --git a/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java b/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java index 0768592d03..398faf98ab 100644 --- a/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java +++ b/src/main/java/com/github/technus/tectech/loader/gui/ModGuiHandler.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import com.github.technus.tectech.thing.item.gui.ScanDisplayScreen; + import cpw.mods.fml.common.network.IGuiHandler; /** diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/MachineEMBehaviours.java b/src/main/java/com/github/technus/tectech/loader/recipe/MachineEMBehaviours.java index 6ca2e8f77d..d05e735476 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/MachineEMBehaviours.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/MachineEMBehaviours.java @@ -6,6 +6,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviou import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_ElectromagneticSeparator; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.Behaviour_Recycler; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine; + import gregtech.api.enums.ItemList; public class MachineEMBehaviours implements Runnable { diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 2b902b2a87..13311c57ba 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -32,9 +32,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import vexatos.tgregworks.reference.PartTypes; -import vexatos.tgregworks.util.TGregUtils; - import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.CustomItemList; @@ -45,6 +42,8 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import vexatos.tgregworks.reference.PartTypes; +import vexatos.tgregworks.util.TGregUtils; public class ResearchStationAssemblyLine implements Runnable { diff --git a/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java b/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java index 0b17256379..86313e4303 100644 --- a/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java +++ b/src/main/java/com/github/technus/tectech/mechanics/avr/SidedRedstone.java @@ -1,10 +1,13 @@ package com.github.technus.tectech.mechanics.avr; +import net.minecraftforge.common.util.ForgeDirection; + import com.github.technus.avrClone.AvrCore; import com.github.technus.avrClone.registerPackages.IInterrupt; import com.github.technus.avrClone.registerPackages.IRegister; import com.github.technus.avrClone.registerPackages.IRegisterBit; import com.github.technus.avrClone.registerPackages.RegisterPackageSync; + import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public class SidedRedstone extends RegisterPackageSync { @@ -26,10 +29,10 @@ public class SidedRedstone extends RegisterPackageSync 0 ? 1 : 0) << i; - core.setDataValue(addr++, iGregTechTileEntity.getInputRedstoneSignal(i)); + for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { + int val = iGregTechTileEntity.getInternalInputRedstoneSignal(side); + sides |= (val > 0 ? 1 : 0) << side.ordinal(); + core.setDataValue(addr++, iGregTechTileEntity.getInputRedstoneSignal(side)); core.setDataValue(addr++, val); addr++; } @@ -70,9 +73,9 @@ public class SidedRedstone extends RegisterPackageSync 0L; + output = IGT.injectEnergyUnits(ForgeDirection.UP, teslaVoltageInjected, 1L) > 0L; } else { teslaSimpleNodeSetRemove(this); } diff --git a/src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java b/src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java index 2c52ef30da..1523302a24 100644 --- a/src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java +++ b/src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java @@ -1,8 +1,8 @@ package com.github.technus.tectech.nei; -import codechicken.nei.api.IConfigureNEI; - import com.github.technus.tectech.recipe.TT_recipe; + +import codechicken.nei.api.IConfigureNEI; import cpw.mods.fml.common.FMLCommonHandler; public class NEI_TT_Config implements IConfigureNEI { // must be NEI*Config diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java index 0ec0e3891c..c70442a63c 100644 --- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java +++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java @@ -17,6 +17,10 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; +import com.github.technus.tectech.Reference; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.recipe.TT_recipe; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.PositionedStack; @@ -24,11 +28,6 @@ import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; - -import com.github.technus.tectech.Reference; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.recipe.TT_recipe; - import cpw.mods.fml.common.event.FMLInterModComms; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java index 364f245a64..405028e785 100644 --- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java +++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java @@ -17,6 +17,10 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; +import com.github.technus.tectech.Reference; +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.recipe.TT_recipe; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.PositionedStack; @@ -24,11 +28,6 @@ import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; - -import com.github.technus.tectech.Reference; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.recipe.TT_recipe; - import cpw.mods.fml.common.event.FMLInterModComms; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java index 5b2e1543e0..317a820ffe 100644 --- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java @@ -55,11 +55,10 @@ public class ClientProxy extends CommonProxy { } @Override - public void em_particle(IGregTechTileEntity aMuffler, byte facing) { // CUTE! - ForgeDirection aDir = ForgeDirection.getOrientation(facing); - float xPos = aDir.offsetX * 0.76F + aMuffler.getXCoord() + 0.25F; - float yPos = aDir.offsetY * 0.76F + aMuffler.getYCoord() + 0.25F; - float zPos = aDir.offsetZ * 0.76F + aMuffler.getZCoord() + 0.25F; + public void em_particle(IGregTechTileEntity aMuffler, ForgeDirection facing) { // CUTE! + float xPos = facing.offsetX * 0.76F + aMuffler.getXCoord() + 0.25F; + float yPos = facing.offsetY * 0.76F + aMuffler.getYCoord() + 0.25F; + float zPos = facing.offsetZ * 0.76F + aMuffler.getZCoord() + 0.25F; EntityFX particle = new WeightlessParticleFX( aMuffler.getWorld(), @@ -74,23 +73,22 @@ public class ClientProxy extends CommonProxy { } @Override - public void pollutor_particle(IGregTechTileEntity aMuffler, byte facing) { - ForgeDirection aDir = ForgeDirection.getOrientation(facing); - float xPos = aDir.offsetX * 0.76F + aMuffler.getXCoord() + 0.25F; - float yPos = aDir.offsetY * 0.76F + aMuffler.getYCoord() + 0.25F; - float zPos = aDir.offsetZ * 0.76F + aMuffler.getZCoord() + 0.25F; + public void pollutor_particle(IGregTechTileEntity aMuffler, ForgeDirection facing) { + float xPos = facing.offsetX * 0.76F + aMuffler.getXCoord() + 0.25F; + float yPos = facing.offsetY * 0.76F + aMuffler.getYCoord() + 0.25F; + float zPos = facing.offsetZ * 0.76F + aMuffler.getZCoord() + 0.25F; - float ySpd = aDir.offsetY * 0.1F + 0.2F + 0.1F * (float) RANDOM.nextGaussian(); + float ySpd = facing.offsetY * 0.1F + 0.2F + 0.1F * (float) RANDOM.nextGaussian(); float xSpd; float zSpd; - if (aDir.offsetY == -1) { + if (facing.offsetY == -1) { float temp = RANDOM.nextFloat() * 2 * (float) Math.PI; xSpd = (float) Math.sin(temp) * 0.1F * (float) RANDOM.nextGaussian(); zSpd = (float) Math.cos(temp) * 0.1F * (float) RANDOM.nextGaussian(); } else { - xSpd = aDir.offsetX * (0.1F + 0.2F * (float) RANDOM.nextGaussian()); - zSpd = aDir.offsetZ * (0.1F + 0.2F * (float) RANDOM.nextGaussian()); + xSpd = facing.offsetX * (0.1F + 0.2F * (float) RANDOM.nextGaussian()); + zSpd = facing.offsetZ * (0.1F + 0.2F * (float) RANDOM.nextGaussian()); } aMuffler.getWorld().spawnParticle( "largesmoke", diff --git a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java index 5fdef492e8..51284a8684 100644 --- a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java +++ b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java @@ -6,6 +6,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.IGuiHandler; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -14,9 +15,9 @@ public class CommonProxy implements IGuiHandler { public void registerRenderInfo() {} - public void em_particle(IGregTechTileEntity aMuffler, byte facing) {} // CUTE! + public void em_particle(IGregTechTileEntity aMuffler, ForgeDirection facing) {} // CUTE! - public void pollutor_particle(IGregTechTileEntity aPollutor, byte facing) {} // CUTE! + public void pollutor_particle(IGregTechTileEntity aPollutor, ForgeDirection facing) {} // CUTE! public void em_particle(World w, double x, double y, double z) {} diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index 3b8af75623..d217fe7db1 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -21,10 +21,6 @@ import net.minecraftforge.fluids.FluidStack; import org.apache.commons.lang3.tuple.Pair; -import pers.gwyog.gtneioreplugin.plugin.block.BlockDimensionDisplay; -import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper; -import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; - import com.github.technus.tectech.util.ItemStackLong; import gnu.trove.map.TMap; @@ -34,6 +30,9 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import pers.gwyog.gtneioreplugin.plugin.block.BlockDimensionDisplay; +import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper; +import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; @SuppressWarnings("SpellCheckingInspection") public class EyeOfHarmonyRecipe { diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java index a27892bc65..372d26a0bd 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java @@ -13,18 +13,17 @@ import net.minecraft.item.ItemStack; import org.apache.commons.lang3.tuple.Pair; -import pers.gwyog.gtneioreplugin.plugin.block.BlockDimensionDisplay; -import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; -import pers.gwyog.gtneioreplugin.util.DimensionHelper; -import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper; -import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; - import com.github.technus.tectech.util.ItemStackLong; import com.google.common.math.LongMath; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import pers.gwyog.gtneioreplugin.plugin.block.BlockDimensionDisplay; +import pers.gwyog.gtneioreplugin.plugin.block.ModBlocks; +import pers.gwyog.gtneioreplugin.util.DimensionHelper; +import pers.gwyog.gtneioreplugin.util.GT5OreLayerHelper; +import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; public class EyeOfHarmonyRecipeStorage { diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java index 6f1d2bd37b..b249b5968b 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java @@ -20,9 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidStack; -import appeng.util.ReadableNumberConverter; -import codechicken.nei.PositionedStack; - import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap; @@ -34,6 +31,8 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.ProgressBar; +import appeng.util.ReadableNumberConverter; +import codechicken.nei.PositionedStack; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.gui.modularui.GT_UITextures; import gregtech.api.util.GT_LanguageManager; diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java index 9495d24770..0323262883 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java +++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java @@ -10,6 +10,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import com.github.technus.tectech.TecTech; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; /** diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java index fc950fa1a2..3847407427 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java @@ -124,10 +124,10 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { switch (aMeta) { case 0: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM0[0]; @@ -135,7 +135,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { return tM0[1]; } case 1: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM1[0]; @@ -143,7 +143,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { return tM1[1]; } case 2: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM2[0]; @@ -151,7 +151,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { return tM2[1]; } case 3: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM3[0]; @@ -159,7 +159,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { return tM3[1]; } case 4: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM4[0]; @@ -167,7 +167,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { return tM4[1]; } case 5: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM5[0]; @@ -175,7 +175,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { return tM5[1]; } case 6: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM6[0]; @@ -185,7 +185,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { case 7: return tM7; case 8: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM8[0]; @@ -193,7 +193,7 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { return tM8[1]; } case 9: - switch (aSide) { + switch (ordinalSide) { case 0: case 1: return tM9[0]; @@ -213,9 +213,9 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { + public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) { int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - return getIcon(aSide, tMeta); + return getIcon(ordinalSide, tMeta); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java index 99bcc35024..00021154f4 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java @@ -52,11 +52,11 @@ public class GT_Block_CasingsNH extends GT_Block_Casings_Abstract { } @Override - public IIcon getIcon(int aSide, int aMeta) { - if (aSide == 0) { + public IIcon getIcon(int ordinalSide, int aMeta) { + if (ordinalSide == 0) { return MACHINECASINGS_BOTTOM_TT[aMeta].getIcon(); } - if (aSide == 1) { + if (ordinalSide == 1) { return MACHINECASINGS_TOP_TT[aMeta].getIcon(); } return MACHINECASINGS_SIDE_TT[aMeta].getIcon(); diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java index c2647985bd..2d83a6f6ec 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java @@ -129,22 +129,22 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { switch (aMeta) { case 0: return eM0; case 1: - if (aSide < 2) { + if (ordinalSide < 2) { return eM1; } return eM1s; case 2: - if (aSide < 2) { + if (ordinalSide < 2) { return eM2; } return eM2s; case 3: - if (aSide < 2) { + if (ordinalSide < 2) { return eM3; } return eM3s; @@ -155,7 +155,7 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { case 6: return eM6; case 7: - if (aSide < 2) { + if (ordinalSide < 2) { return eM7; } return eM7s; @@ -174,7 +174,7 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { case 14: return eM14; case 15: - return debug[aSide]; + return debug[ordinalSide]; default: return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } @@ -182,9 +182,9 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { + public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) { int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - return getIcon(aSide, tMeta); + return getIcon(ordinalSide, tMeta); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java index 46857b778b..c3b00dcc0c 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java @@ -79,7 +79,7 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { switch (aMeta) { case 0: return textureTier0; @@ -106,9 +106,9 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { + public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) { int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - return getIcon(aSide, tMeta); + return getIcon(ordinalSide, tMeta); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java index 3191e59d10..98215ab3ba 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java @@ -76,7 +76,7 @@ public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { switch (aMeta) { case 0: return textureTier0; @@ -103,9 +103,9 @@ public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { + public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) { int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - return getIcon(aSide, tMeta); + return getIcon(ordinalSide, tMeta); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java index 56f1c1e0dd..d9e8e14a04 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java @@ -79,7 +79,7 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { } @Override - public IIcon getIcon(int aSide, int aMeta) { + public IIcon getIcon(int ordinalSide, int aMeta) { switch (aMeta) { case 0: return textureTier0; @@ -106,9 +106,9 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { + public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int ordinalSide) { int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - return getIcon(aSide, tMeta); + return getIcon(ordinalSide, tMeta); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java index 8baabd7683..72e38ed75d 100644 --- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java +++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java @@ -38,12 +38,13 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { public GT_Cover_TM_EnderFluidLink() {} - private void transferFluid(IFluidHandler source, byte sSide, IFluidHandler target, byte tSide, int amount) { - FluidStack fluidStack = source.drain(ForgeDirection.getOrientation(sSide), amount, false); + private void transferFluid(IFluidHandler source, ForgeDirection side, IFluidHandler target, ForgeDirection tSide, + int amount) { + FluidStack fluidStack = source.drain(side, amount, false); if (fluidStack != null) { - int fluidTransferred = target.fill(ForgeDirection.getOrientation(tSide), fluidStack, true); - source.drain(ForgeDirection.getOrientation(sSide), fluidTransferred, true); + int fluidTransferred = target.fill(tSide, fluidStack, true); + source.drain(side, fluidTransferred, true); } } @@ -56,38 +57,40 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior { } @Override - public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, - long aTimer) { + public int doCoverThings(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable, + ICoverable aTileEntity, long aTimer) { if ((aTileEntity instanceof IFluidHandler)) { IFluidHandler fluidHandlerSelf = (IFluidHandler) aTileEntity; IFluidHandler fluidHandlerEnder = getEnderFluidContainer(getEnderLinkTag((IFluidHandler) aTileEntity)); if (testBit(aCoverVariable, IMPORT_EXPORT_MASK)) { - transferFluid(fluidHandlerEnder, (byte) 6, fluidHandlerSelf, aSide, L_PER_TICK); + transferFluid(fluidHandlerEnder, ForgeDirection.UNKNOWN, fluidHandlerSelf, side, L_PER_TICK); } else { - transferFluid(fluidHandlerSelf, aSide, fluidHandlerEnder, (byte) 6, L_PER_TICK); + transferFluid(fluidHandlerSelf, side, fluidHandlerEnder, ForgeDirection.UNKNOWN, L_PER_TICK); } } return aCoverVariable; } @Override - public String