diff options
| author | Technus <daniel112092@gmail.com> | 2017-12-17 07:05:06 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-12-17 07:05:06 +0100 |
| commit | 4da1b57533dbfcd564c9a216dd2796664e65c36c (patch) | |
| tree | b86ebb95297aed5910f6a605c02b082953d61026 /src/main/java/openmodularturrets/tileentity | |
| parent | d1bbc1bba95492a4256b98dbdaedaa178c204b04 (diff) | |
| parent | ffce854a03b63f1f37f22261536bf98a4f05d030 (diff) | |
| download | GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.tar.gz GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.tar.bz2 GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.zip | |
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/java/openmodularturrets/tileentity')
| -rw-r--r-- | src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java | 6 | ||||
| -rw-r--r-- | src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java index 277d692f47..343a1e5ebd 100644 --- a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java +++ b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java @@ -1,7 +1,7 @@ package openmodularturrets.tileentity.turret; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; -import com.github.technus.tectech.thing.item.DebugContainer_EM; +import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; +import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -54,7 +54,7 @@ public class TileTurretHeadEM extends TurretHead{ } public Item getAmmo() { - return DebugContainer_EM.INSTANCE;//Placeholder item that cannot be achieved, yet still usable for debug + return DebugElementalInstanceContainer_EM.INSTANCE;//Placeholder item that cannot be achieved, yet still usable for debug } public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) { diff --git a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java index f5d22be3ed..acecfb4a37 100644 --- a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java +++ b/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java @@ -1,6 +1,6 @@ package openmodularturrets.tileentity.turretbase; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; +import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental; import cpw.mods.fml.common.Optional; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; |