Fix security exception by refactoring package

14 files changed, 57 insertions, 36 deletions

diff --git a/src/main/java/openmodularturrets/TT_turret_loader.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java
index 57470f54f6..2ab7a37ecd 100644
--- a/src/main/java/openmodularturrets/TT_turret_loader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/TT_turret_loader.java
@@ -1,15 +1,15 @@
-package openmodularturrets;
+package com.github.technus.tectech.compatibility.openmodularturrets;
 
+import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadItemRenderEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadRenderEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileRenderEM;
 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;
+import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM;
 
 public class TT_turret_loader implements Runnable {
     @Override
diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java
index aead67cb22..10a5aba625 100644
--- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java
@@ -1,4 +1,4 @@
-package openmodularturrets.blocks.turretbases;
+package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretbases;
 
 import com.github.technus.tectech.Reference;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -6,13 +6,14 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import openmodularturrets.blocks.turretbases.BlockAbstractTurretBase;
 import openmodularturrets.handler.ConfigHandler;
-import openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
 
 import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 
 /**
- * Created by Bass on 27/07/2017.
+ * Created by Tec on 27/07/2017.
  */
 public class TurretBaseEM extends BlockAbstractTurretBase {
     private final int MaxCharge = ConfigHandler.getBaseTierFiveMaxCharge();
diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
index 61f877e81b..af0be0e1f5 100644
--- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
@@ -1,4 +1,4 @@
-package openmodularturrets.blocks.turretbases;
+package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretbases;
 
 import com.github.technus.tectech.CommonValues;
 import net.minecraft.block.Block;
@@ -11,7 +11,7 @@ import net.minecraft.util.StatCollector;
 import java.util.List;
 
 /**
- * Created by Bass on 28/07/2017.
+ * Created by Tec on 28/07/2017.
  */
 public class TurretBaseItemEM extends ItemBlock {
     public TurretBaseItemEM(Block block) {
diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java
index 3710092eb5..1e34af422e 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java
@@ -1,4 +1,4 @@
-package openmodularturrets.blocks.turretheads;
+package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
@@ -8,13 +8,13 @@ import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import openmodularturrets.tileentity.turret.TileTurretHeadEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM;
 import openmodularturrets.tileentity.turretbase.TurretBase;
 
 import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
 
 /**
- * Created by Bass on 27/07/2017.
+ * Created by Tec on 27/07/2017.
  */
 public class TurretHeadEM extends Block implements ITileEntityProvider {
     public static TurretHeadEM INSTANCE;
diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
index db3c089e47..8aa598c440 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
@@ -1,4 +1,4 @@
-package openmodularturrets.blocks.turretheads;
+package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,7 +14,7 @@ import java.util.List;
 import static com.github.technus.tectech.CommonValues.TEC_MARK_EM;
 
 /**
- * Created by Bass on 28/07/2017.
+ * Created by Tec on 28/07/2017.
  */
 public class TurretHeadItemEM extends ItemBlock {
     private static final DecimalFormat df = new DecimalFormat("0.0");
diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java
index 4760e2b16e..ceca057900 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java
@@ -1,9 +1,9 @@
-package openmodularturrets.blocks.turretheads;
+package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.IItemRenderer;
 import openmodularturrets.client.render.models.ModelLaserTurret;
-import openmodularturrets.tileentity.turret.TileTurretHeadEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret.TileTurretHeadEM;
 import org.lwjgl.opengl.GL11;
 
 /**
diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java
index 23379b9585..f407257eab 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java
@@ -1,8 +1,8 @@
-package openmodularturrets.blocks.turretheads;
+package com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads;
 
 import openmodularturrets.client.render.renderers.blockitem.LaserTurretRenderer;
 
 /**
- * Created by Bass on 28/07/2017.
+ * Created by Tec on 28/07/2017.
  */
 public class TurretHeadRenderEM extends LaserTurretRenderer {}
diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index da4e7ce731..c22c6c4b95 100644
--- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -1,4 +1,4 @@
-package openmodularturrets.entity.projectiles;
+package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
@@ -11,19 +11,24 @@ import net.minecraft.block.Block;
 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 openmodularturrets.util.TurretHeadUtil;
 
 
 /**
  * Created by Bass on 27/07/2017.
  */
-public class projectileEM extends TurretProjectile {
+public class projectileEM extends LaserProjectile {
     public float gravity=0;
     private TurretBase turretBase;
 
-    private boolean exotic, antiMatter;
+    private boolean exotic, antiMatter,isAmped;
+
+    private int ampLevel;
 
     private float massFactor;
 
@@ -33,6 +38,11 @@ public class projectileEM extends TurretProjectile {
 
     public projectileEM(World par1World, TurretBase turretBase) {
         super(par1World, turretBase);
+        int amp=TurretHeadUtil.getAmpLevel(turretBase);
+        if (amp > 0) {
+            this.isAmped = true;
+            this.ampLevel = amp;
+        }
     }
 
     public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) {
@@ -87,7 +97,7 @@ public class projectileEM extends TurretProjectile {
                         worldObj.createExplosion(null,
                                 movingobjectposition.blockX + 0.5D,
                                 movingobjectposition.blockY + 0.5D,
-                                movingobjectposition.blockZ + 0.5D, (exotic?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? amp_level*.1f +1:1) * (ticksExisted/250f), true);
+                                movingobjectposition.blockZ + 0.5D, (exotic?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
                     } else {
                         return;
                     }
@@ -97,7 +107,7 @@ public class projectileEM extends TurretProjectile {
             if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
                 worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.RANDOM.nextFloat() + 0.5F);
                 if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
-                    float damage = (exotic?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? amp_level*.1f +1:1);
+                    float damage = (exotic?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
 
                     if(movingobjectposition.entityHit instanceof EntityPlayer) {
                         if(canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) {
@@ -123,7 +133,7 @@ public class projectileEM extends TurretProjectile {
                         worldObj.createExplosion(null,
                                 movingobjectposition.entityHit.posX,
                                 movingobjectposition.entityHit.posY,
-                                movingobjectposition.entityHit.posZ, (exotic?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? amp_level*.1f +1:1) * (ticksExisted/250f), true);
+                                movingobjectposition.entityHit.posZ, (exotic?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
                     }
                 }
             }
@@ -131,10 +141,19 @@ public class projectileEM extends TurretProjectile {
         }
     }
 
+    public boolean canDamagePlayer(EntityPlayer entityPlayer) {
+        return ConfigHandler.turretDamageTrustedPlayers || this.turretBase.getTrustedPlayer(entityPlayer.getUniqueID()) == null && !PlayerUtil.getPlayerUIDUnstable(this.turretBase.getOwner()).equals(entityPlayer.getUniqueID());
+    }
+
     @Override
     public void onEntityUpdate() {
         if(ticksExisted >= 75) {
             setDead();
         }
     }
+
+    @Override
+    protected float getGravityVelocity() {
+        return gravity;
+    }
 }
diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java
index 45782e9102..812a752562 100644
--- a/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileRenderEM.java
@@ -1,4 +1,4 @@
-package openmodularturrets.entity.projectiles;
+package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles;
 
 import com.github.technus.tectech.Reference;
 import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index 7c38abd424..2de6b39c4c 100644
--- a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -1,5 +1,7 @@
-package openmodularturrets.tileentity.turret;
+package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret;
 
+import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
@@ -7,9 +9,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import openmodularturrets.entity.projectiles.TurretProjectile;
-import openmodularturrets.entity.projectiles.projectileEM;
 import openmodularturrets.handler.ConfigHandler;
-import openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
diff --git a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
index 7feb49ef82..a31ba4ef2c 100644
--- a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
@@ -1,4 +1,4 @@
-package openmodularturrets.tileentity.turretbase;
+package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
@@ -6,6 +6,7 @@ import cpw.mods.fml.common.Optional;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import openmodularturrets.tileentity.turretbase.TurretBaseTierFiveTileEntity;
 
 /**
  * Created by Bass on 27/07/2017.
diff --git a/src/main/java/com/github/technus/tectech/loader/entity/EntityLoader.java b/src/main/java/com/github/technus/tectech/loader/entity/EntityLoader.java
index d2d6332ef3..db352adce3 100644
--- a/src/main/java/com/github/technus/tectech/loader/entity/EntityLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/entity/EntityLoader.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.loader.entity;
 import com.github.technus.tectech.TecTech;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.EntityRegistry;
-import openmodularturrets.entity.projectiles.projectileEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
 
 /**
  * Created by Tec on 30.07.2017.
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
index c5406a2206..6293d70ae1 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
@@ -13,8 +13,8 @@ import com.github.technus.tectech.thing.item.*;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
-import openmodularturrets.blocks.turretbases.TurretBaseEM;
-import openmodularturrets.blocks.turretheads.TurretHeadEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretbases.TurretBaseEM;
+import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turretheads.TurretHeadEM;
 
 import static com.github.technus.tectech.TecTech.tectechTexturePage1;
 
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 1eea24edae..b936de00fc 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -22,7 +22,7 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
-import openmodularturrets.TT_turret_loader;
+import com.github.technus.tectech.compatibility.openmodularturrets.TT_turret_loader;
 import org.lwjgl.opengl.GL11;
 
 public class ClientProxy extends CommonProxy {