aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-07-30 17:24:31 +0200
committerTechnus <daniel112092@gmail.com>2017-07-30 17:24:31 +0200
commit0409d4bccfc32d116612cb8a6a3d0e9e7790c895 (patch)
tree6452ee3a324737235842d783a8f9de1e2f5d922f
parent40145b83953f22feace2d7c09c128cdbdade4408 (diff)
downloadGT5-Unofficial-0409d4bccfc32d116612cb8a6a3d0e9e7790c895.tar.gz
GT5-Unofficial-0409d4bccfc32d116612cb8a6a3d0e9e7790c895.tar.bz2
GT5-Unofficial-0409d4bccfc32d116612cb8a6a3d0e9e7790c895.zip
Refactor turret to gain accees to package private things...
Also fixes projectile and adds most of the mechanics to it.
-rw-r--r--src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java12
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java4
-rw-r--r--src/main/java/com/github/technus/tectech/loader/EntityLoader.java15
-rw-r--r--src/main/java/com/github/technus/tectech/loader/MainLoader.java10
-rw-r--r--src/main/java/com/github/technus/tectech/loader/ThingsLoader.java5
-rw-r--r--src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java1
-rw-r--r--src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java1
-rw-r--r--src/main/java/com/github/technus/tectech/proxy/ClientProxy.java15
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java3
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/entity/projectileEM.java74
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java1
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/tileEntity/TileTurretBaseEM.java78
-rw-r--r--src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java (renamed from src/main/java/com/github/technus/tectech/thing/block/TurretBaseEM.java)10
-rw-r--r--src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java (renamed from src/main/java/com/github/technus/tectech/thing/block/TurretBaseItemEM.java)2
-rw-r--r--src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java (renamed from src/main/java/com/github/technus/tectech/thing/block/TurretHeadEM.java)4
-rw-r--r--src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java (renamed from src/main/java/com/github/technus/tectech/thing/block/TurretHeadItemEM.java)2
-rw-r--r--src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java37
-rw-r--r--src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java (renamed from src/main/java/com/github/technus/tectech/thing/block/TurretHeadRenderEM.java)2
-rw-r--r--src/main/java/openmodularturrets/entity/projectiles/projectileEM.java123
-rw-r--r--src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java74
-rw-r--r--src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java (renamed from src/main/java/com/github/technus/tectech/thing/tileEntity/TileTurretHeadEM.java)21
-rw-r--r--src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java63
-rw-r--r--src/main/resources/assets/tectech/textures/blocks/turretBaseEM.pngbin0 -> 1166 bytes
-rw-r--r--src/main/resources/assets/tectech/textures/entity/projectileEM.pngbin0 -> 4254 bytes
40 files changed, 392 insertions, 182 deletions
diff --git a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java
index 633bbc5097..59b3e2e0fe 100644
--- a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java
+++ b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java
@@ -15,6 +15,9 @@ public class TecTechConfig extends ConfigManager {
public static final boolean DEBUG_MODE = true;
public boolean BOOM_ENABLE;
public boolean NERF_FUSION;
+ public boolean ENABLE_TURRET_EXPLOSIONS;
+ public float TURRET_DAMAGE_FACTOR;
+ public float TURRET_EXPLOSION_FACTOR;
@Override
protected void PreInit() {
@@ -22,6 +25,9 @@ public class TecTechConfig extends ConfigManager {
//DEBUG_MODE = false;
BOOM_ENABLE = true;
NERF_FUSION = true;
+ ENABLE_TURRET_EXPLOSIONS = true;
+ TURRET_DAMAGE_FACTOR=10;
+ TURRET_EXPLOSION_FACTOR=1;
}
@Override
@@ -34,6 +40,12 @@ public class TecTechConfig extends ConfigManager {
"Set to false to disable explosions on everything bad that you can do (this will not be available after release)");
NERF_FUSION = _mainConfig.getBoolean("NerfFusion", "Features", NERF_FUSION,
"Set to false to disable nerfing of plasmas heavier than Fe");
+ ENABLE_TURRET_EXPLOSIONS = _mainConfig.getBoolean("TurretBoomEnable", "Features", ENABLE_TURRET_EXPLOSIONS,
+ "Set to false to disable explosions caused by EM turrets");
+ TURRET_DAMAGE_FACTOR = _mainConfig.getFloat("TurretDamageFactor", "Features", TURRET_DAMAGE_FACTOR, 0, Short.MAX_VALUE,
+ "Damage is multiplied by this number");
+ TURRET_EXPLOSION_FACTOR = _mainConfig.getFloat("TurretExplosionFactor", "Features", TURRET_EXPLOSION_FACTOR, 0, Short.MAX_VALUE,
+ "Explosion strength is multiplied by this number");
}
@Override
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
index 3443463718..7d27f573bb 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
@@ -267,6 +267,10 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
return map.get(def);
}
+ public cElementalInstanceStack get(int i){
+ return map.values().toArray(new cElementalInstanceStack[0])[i];
+ }
+
public String[] getElementalInfo() {
final String[] info = new String[map.size() * 4];
int i = 0;
diff --git a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
new file mode 100644
index 0000000000..f77312850c
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
@@ -0,0 +1,15 @@
+package com.github.technus.tectech.loader;
+
+import com.github.technus.tectech.TecTech;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import openmodularturrets.entity.projectiles.projectileEM;
+
+/**
+ * Created by Tec on 30.07.2017.
+ */
+public class EntityLoader implements Runnable {
+ @Override
+ public void run() {
+ EntityRegistry.registerModEntity(projectileEM.class, "projectileEM", 0, TecTech.instance, 16, 5, true);
+ }
+}
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 9355c20c9b..a370e8a4a4 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -10,7 +10,9 @@ import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
import com.github.technus.tectech.thing.item.DebugBuilder;
import com.github.technus.tectech.thing.item.DebugContainer_EM;
import com.github.technus.tectech.thing.machineTT;
+import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ProgressManager;
+import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTech_API;
@@ -18,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
+import openmodularturrets.entity.projectiles.projectileEM;
import java.util.List;
@@ -30,7 +33,7 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft
public static DamageSource microwaving;
public void load() {
- ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 5);
+ ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 6);
progressBarLoad.step("Elemental Things");
new ElementalLoader().run();
@@ -43,6 +46,7 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft
} else {
essentiaContainerCompat = new EssentiaCompat();
}
+ TecTech.Logger.info("Thaumcraft Compatibility Done");
progressBarLoad.step("Regular Things");
new ThingsLoader().run();
@@ -52,6 +56,10 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft
new MachineLoader().run();
TecTech.Logger.info("Machine Init Done");
+ progressBarLoad.step("Register entities");
+ new EntityLoader().run();
+ TecTech.Logger.info("Entities registered");
+
progressBarLoad.step("Add damage types");
microwaving=new DamageSource("microwaving");
microwaving.setDamageAllowedInCreativeMode();
diff --git a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
index 8a3523f9df..3f4b92c3c4 100644
--- a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
@@ -2,13 +2,14 @@ package com.github.technus.tectech.loader;
import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.block.TurretBaseEM;
-import com.github.technus.tectech.thing.block.TurretHeadEM;
+import openmodularturrets.blocks.turretbases.TurretBaseEM;
+import openmodularturrets.blocks.turretheads.TurretHeadEM;
import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT;
import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
import com.github.technus.tectech.thing.item.DebugBuilder;
import com.github.technus.tectech.thing.item.DebugContainer_EM;
import cpw.mods.fml.common.Loader;
+import openmodularturrets.entity.projectiles.projectileEM;
/**
* Created by danie_000 on 16.11.2016.
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 4a94679a6d..af93f0ca06 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -16,6 +16,7 @@ import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.Util.StructureBuilder;
import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
import static gregtech.api.enums.GT_Values.E;
import static gregtech.api.enums.GT_Values.V;
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index c1783fc774..fc704d7ecb 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -16,6 +16,7 @@ import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.Util.StructureBuilder;
import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
import static gregtech.api.enums.GT_Values.E;
import static gregtech.api.enums.GT_Values.V;
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 d68ef8b9a3..ba76c0ec44 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -2,8 +2,12 @@ package com.github.technus.tectech.proxy;
import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.thing.block.QuantumGlassRender;
-import com.github.technus.tectech.thing.block.TurretHeadRenderEM;
-import com.github.technus.tectech.thing.tileEntity.TileTurretHeadEM;
+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;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -14,12 +18,12 @@ import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.particle.EntityExplodeFX;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
import net.minecraft.world.World;
+import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
-import static openmodularturrets.client.render.renderers.blockitem.TileEntityRenderers.laserTurretRenderer;
-
public class ClientProxy extends CommonProxy {
@Override
public void registerRenderInfo() {
@@ -29,6 +33,9 @@ public class ClientProxy extends CommonProxy {
if(Loader.isModLoaded("openmodularturrets")) {
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());
}
}
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 85036897a3..4961bc784e 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
@@ -22,13 +22,14 @@ import java.util.List;
*/
public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
+ public final static int textureOffset = 96;
private static IIcon eM0, eM1, eM1s, eM2, eM2s, eM3, eM3s, eM4, eM5, eM6, eM7, eM7s, eM8, eM9, eM10, eM11, eM12, eM13, eM14;
private static IIcon debug[] = new IIcon[6];
public GT_Block_CasingsTT() {
super(GT_Item_CasingsTT.class, "gt.blockcasingsTT", GT_Material_Casings.INSTANCE);
for (byte i = 0; i < 15; i = (byte) (i + 1)) {
- Textures.BlockIcons.CASING_BLOCKS[(i + 96)] = new GT_CopiedBlockTexture(this, 6, i);
+ Textures.BlockIcons.CASING_BLOCKS[(i + textureOffset)] = new GT_CopiedBlockTexture(this, 6, i);
/*IMPORTANT for block recoloring**/
}
GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "High Power Casing");
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/entity/projectileEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/entity/projectileEM.java
deleted file mode 100644
index 76b0071527..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/entity/projectileEM.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.github.technus.tectech.thing.metaTileEntity.entity;
-
-import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap;
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-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 java.util.Random;
-
-/**
- * Created by Bass on 27/07/2017.
- */
-public class projectileEM extends LaserProjectile {
- private TurretBase turretBase;
-
- public projectileEM(World par1World) {
- super(par1World);
- this.gravity = 0.0F;
- }
-
- public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) {
- super(par1World, turretBase);
- this.turretBase = turretBase;
- this.gravity = 0.0F;
- }
-
- protected void onImpact(MovingObjectPosition movingobjectposition) {
- if(this.ticksExisted > 1) {
- if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
- Block hitBlock = this.worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ);
- if(hitBlock != null && !hitBlock.getMaterial().isSolid()) {
- return;
- }
- }
-
- if(movingobjectposition.entityHit != null && !this.worldObj.isRemote) {
- Random random = new Random();
- this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), random.nextFloat() + 0.5F);
- if(movingobjectposition.entityHit != null && !this.worldObj.isRemote) {
- int damage = ConfigHandler.getLaserTurretSettings().getDamage();
- if(movingobjectposition.entityHit instanceof EntityLivingBase) {
- EntityLivingBase elb = (EntityLivingBase)movingobjectposition.entityHit;
- damage = (int)((double)damage + (double)((int)elb.getHealth()) * 0.1D);
- }
-
- if(movingobjectposition.entityHit instanceof EntityPlayer) {
- if(this.canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) {
- movingobjectposition.entityHit.setFire(2);
- movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), (float)damage);
- movingobjectposition.entityHit.hurtResistantTime = 0;
- }
- } else {
- movingobjectposition.entityHit.setFire(2);
- movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), (float)damage);
- movingobjectposition.entityHit.hurtResistantTime = 0;
- }
- }
- }
-
- this.setDead();
- }
- }
-
- private boolean canDamagePlayer(EntityPlayer entityPlayer) {
- return ConfigHandler.turretDamageTrustedPlayers || this.turretBase.getTrustedPlayer(entityPlayer.getUniqueID()) == null && !PlayerUtil.getPlayerUIDUnstable(this.turretBase.getOwner()).equals(entityPlayer.getUniqueID());
- }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
index 57488e9072..799bdc1404 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
@@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.Util.StructureBuilder;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
/**
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
index 3f83e923f4..118af9093c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
@@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.Util.StructureBuilder;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
import static gregtech.api.enums.GT_Values.E;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index eebfd99b28..3ee9b844b1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -19,6 +19,7 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.util.ForgeDirection;
import static com.github.technus.tectech.Util.StructureBuilder;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
/**
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
index 6e36a8b3a7..3f347ba33b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
@@ -24,6 +24,7 @@ import net.minecraft.util.EnumChatFormatting;
import java.util.ArrayList;
import static com.github.technus.tectech.Util.StructureBuilder;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
import static gregtech.api.enums.GT_Values.V;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java
index 9c4e7ff147..bc59a4fb0d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java
@@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.Util.StructureBuilder;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
/**
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index 19b63ed604..dd4ca44a3a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -14,6 +14,7 @@ import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.Util.StructureBuilder;
import static com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition.stableRawLifeTime;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
import static gregtech.api.enums.GT_Values.VN;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 4814ba3cde..fbe526d905 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import static com.github.technus.tectech.Util.StructureBuilder;
import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refMass;
import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.refUnstableMass;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
import static gregtech.api.enums.GT_Values.V;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_