From b50eeed3aaed2b9d4921d4cab064d9875d4d3c82 Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 21 Aug 2017 09:19:07 +0200 Subject: Change logic of this --- .../java/openmodularturrets/TT_turret_loader.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/java/openmodularturrets/TT_turret_loader.java (limited to 'src/main/java/openmodularturrets') diff --git a/src/main/java/openmodularturrets/TT_turret_loader.java b/src/main/java/openmodularturrets/TT_turret_loader.java new file mode 100644 index 0000000000..57470f54f6 --- /dev/null +++ b/src/main/java/openmodularturrets/TT_turret_loader.java @@ -0,0 +1,23 @@ +package openmodularturrets; + +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import net.minecraft.item.Item; +import net.minecraftforge.client.MinecraftForgeClient; +import openmodularturrets.blocks.turretheads.TurretHeadEM; +import openmodularturrets.blocks.turretheads.TurretHeadItemRenderEM; +import openmodularturrets.blocks.turretheads.TurretHeadRenderEM; +import openmodularturrets.entity.projectiles.projectileEM; +import openmodularturrets.entity.projectiles.projectileRenderEM; +import openmodularturrets.tileentity.turret.TileTurretHeadEM; + +public class TT_turret_loader implements Runnable { + @Override + public void run() { + TurretHeadRenderEM turretHeadRenderEM=new TurretHeadRenderEM(); + ClientRegistry.bindTileEntitySpecialRenderer(TileTurretHeadEM.class, turretHeadRenderEM); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TurretHeadEM.INSTANCE), new TurretHeadItemRenderEM(turretHeadRenderEM, new TileTurretHeadEM())); + + RenderingRegistry.registerEntityRenderingHandler(projectileEM.class, new projectileRenderEM()); + } +} -- cgit 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') 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 238e7261ba2f8f304081a48b1a43bfd54f8cb4e1 Mon Sep 17 00:00:00 2001 From: Technus Date: Wed, 6 Sep 2017 21:03:25 +0200 Subject: Refactor m8 --- .../java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java | 2 +- .../java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/openmodularturrets') diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java index 36437fa741..3b60922248 100644 --- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java @@ -19,7 +19,7 @@ public class TurretBaseItemEM extends ItemBlock { } public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(CommonValues.tecMark); + list.add(CommonValues.TEC_MARK); list.add(""); list.add(EnumChatFormatting.AQUA + "--" + StatCollector.translateToLocal("tooptip.energy.label") + "--"); list.add(StatCollector.translateToLocal("tooltip.rf.max") + ": " + EnumChatFormatting.WHITE + 1000000000); diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java index db2e034710..c728f30db0 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java @@ -11,7 +11,7 @@ import openmodularturrets.handler.ConfigHandler; import java.text.DecimalFormat; import java.util.List; -import static com.github.technus.tectech.CommonValues.tecMark; +import static com.github.technus.tectech.CommonValues.TEC_MARK; /** * Created by Bass on 28/07/2017. @@ -24,7 +24,7 @@ public class TurretHeadItemEM extends ItemBlock { } public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(tecMark); + list.add(TEC_MARK); list.add(""); list.add(EnumChatFormatting.GOLD + "--" + StatCollector.translateToLocal("tooltip.info") + "--"); list.add(StatCollector.translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + "5"); -- 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 ++++---- .../openmodularturrets/tileentity/turret/TileTurretHeadEM.java | 2 +- .../tileentity/turretbase/TileTurretBaseEM.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java/openmodularturrets') 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; 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 c1c969d48796712f173d042b529813048d6a4c9a Mon Sep 17 00:00:00 2001 From: Technus Date: Wed, 27 Sep 2017 18:13:16 +0200 Subject: Add general marking --- .../java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java | 2 +- .../java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/openmodularturrets') diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java index 3b60922248..c7b3b547c0 100644 --- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java @@ -19,7 +19,7 @@ public class TurretBaseItemEM extends ItemBlock { } public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(CommonValues.TEC_MARK); + list.add(CommonValues.TEC_MARK_EM); list.add(""); list.add(EnumChatFormatting.AQUA + "--" + StatCollector.translateToLocal("tooptip.energy.label") + "--"); list.add(StatCollector.translateToLocal("tooltip.rf.max") + ": " + EnumChatFormatting.WHITE + 1000000000); diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java index c728f30db0..742e7b94fe 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java @@ -11,7 +11,7 @@ import openmodularturrets.handler.ConfigHandler; import java.text.DecimalFormat; import java.util.List; -import static com.github.technus.tectech.CommonValues.TEC_MARK; +import static com.github.technus.tectech.CommonValues.TEC_MARK_EM; /** * Created by Bass on 28/07/2017. @@ -24,7 +24,7 @@ public class TurretHeadItemEM extends ItemBlock { } public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - list.add(TEC_MARK); + list.add(TEC_MARK_EM); list.add(""); list.add(EnumChatFormatting.GOLD + "--" + StatCollector.translateToLocal("tooltip.info") + "--"); list.add(StatCollector.translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + "5"); -- 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') 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 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') 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 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') 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') 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