From f719d0610296dcc419f8befa4e65410984de3bc9 Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 26 Aug 2017 23:34:47 +0200 Subject: bugfixes --- .../openmodularturrets/entity/projectiles/projectileEM.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/main/java/openmodularturrets/entity') diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java index 8400915ad2..ba9eb00dd9 100644 --- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java @@ -27,8 +27,16 @@ public class projectileEM extends TurretProjectile { private float massFactor; - public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) { + public projectileEM(World par1World) { super(par1World); + } + + public projectileEM(World par1World, TurretBase turretBase) { + super(par1World, turretBase); + } + + public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) { + super(par1World, turretBase); this.turretBase = turretBase; boolean onlyQuarks=true; if(avalableEM!=null && avalableEM.hasStacks()) { -- cgit From ede698dbd1822b03276a2d960d475070e033099e Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 18 Sep 2017 21:03:06 +0200 Subject: Refactor --- .../java/openmodularturrets/entity/projectiles/projectileEM.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/openmodularturrets/entity') diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java index ba9eb00dd9..0535b45ac8 100644 --- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java @@ -1,10 +1,10 @@ package openmodularturrets.entity.projectiles; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; -import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap; -import com.github.technus.tectech.elementalMatter.definitions.dHadronDefinition; -import com.github.technus.tectech.elementalMatter.definitions.eQuarkDefinition; +import com.github.technus.tectech.elementalMatter.core.containers.cElementalInstanceStack; +import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; +import com.github.technus.tectech.elementalMatter.definitions.complex.dHadronDefinition; +import com.github.technus.tectech.elementalMatter.definitions.primitive.eQuarkDefinition; import gregtech.api.GregTech_API; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; -- cgit From ce0503b7285376377cb41d8665cd117ca1e3190d Mon Sep 17 00:00:00 2001 From: Technus Date: Wed, 27 Sep 2017 18:13:38 +0200 Subject: Optimize imports --- src/main/java/openmodularturrets/entity/projectiles/projectileEM.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/openmodularturrets/entity') diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java index 0535b45ac8..71fbaf33d0 100644 --- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java @@ -1,8 +1,8 @@ package openmodularturrets.entity.projectiles; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.elementalMatter.core.containers.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; +import com.github.technus.tectech.elementalMatter.core.containers.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.definitions.complex.dHadronDefinition; import com.github.technus.tectech.elementalMatter.definitions.primitive.eQuarkDefinition; import gregtech.api.GregTech_API; -- cgit From b6e219b61b99eb2e8b1f8894c86fedd834e01479 Mon Sep 17 00:00:00 2001 From: Technus Date: Thu, 14 Dec 2017 21:43:37 +0100 Subject: Cleanup code, fix class compare. --- src/main/java/openmodularturrets/entity/projectiles/projectileEM.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/openmodularturrets/entity') diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java index 71fbaf33d0..e4efa6e8fb 100644 --- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java @@ -2,7 +2,7 @@ package openmodularturrets.entity.projectiles; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; -import com.github.technus.tectech.elementalMatter.core.containers.cElementalInstanceStack; +import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.definitions.complex.dHadronDefinition; import com.github.technus.tectech.elementalMatter.definitions.primitive.eQuarkDefinition; import gregtech.api.GregTech_API; -- cgit From 88eb3d0c4472e38bb14797074dd2003def57c7c2 Mon Sep 17 00:00:00 2001 From: Technus Date: Fri, 15 Dec 2017 06:15:18 +0100 Subject: Rework iaea decay branching, some refactoring, remove trinium from bloody loader. --- src/main/java/openmodularturrets/entity/projectiles/projectileEM.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/openmodularturrets/entity') diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java index e4efa6e8fb..e857d748e7 100644 --- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java @@ -3,7 +3,7 @@ package openmodularturrets.entity.projectiles; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack; -import com.github.technus.tectech.elementalMatter.definitions.complex.dHadronDefinition; +import com.github.technus.tectech.elementalMatter.definitions.complex.hadron.dHadronDefinition; import com.github.technus.tectech.elementalMatter.definitions.primitive.eQuarkDefinition; import gregtech.api.GregTech_API; import gregtech.api.util.GT_Utility; -- cgit