From ede698dbd1822b03276a2d960d475070e033099e Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 18 Sep 2017 21:03:06 +0200 Subject: Refactor --- .../java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java | 2 +- .../java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/openmodularturrets/tileentity') diff --git a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java index 277d692f47..fc2e5db293 100644 --- a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java +++ b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java @@ -1,6 +1,6 @@ package openmodularturrets.tileentity.turret; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; +import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; import com.github.technus.tectech.thing.item.DebugContainer_EM; import net.minecraft.entity.Entity; import net.minecraft.item.Item; 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; -- cgit From f80d0e3467231d67d3da303ca2c1385996febb2a Mon Sep 17 00:00:00 2001 From: Technus Date: Thu, 14 Dec 2017 21:21:18 +0100 Subject: first draft of scanning of em data extraction --- .../java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/openmodularturrets/tileentity') diff --git a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java index fc2e5db293..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.core.cElementalInstanceStackMap; -import com.github.technus.tectech.thing.item.DebugContainer_EM; +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) { -- cgit