From ed2242fc11aa9121f04b69a3090fc11dfdb5eb88 Mon Sep 17 00:00:00 2001
From: katzenpapst <praecipitator@gmx.net>
Date: Sun, 4 Jun 2017 00:18:47 +0200
Subject: [PATCH 1/6] shuttle saves dock position

---
 .../entity/spaceship/EntityShuttle.java       | 163 ++++++++++++++----
 .../de/katzenpapst/amunra/vec/Vector3int.java |   7 +
 .../katzenpapst/amunra/world/WorldHelper.java |  63 +++++++
 3 files changed, 198 insertions(+), 35 deletions(-)

diff --git a/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java b/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java
index 219d85a8..adc25080 100755
--- a/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java
+++ b/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java
@@ -14,15 +14,18 @@
 import de.katzenpapst.amunra.tile.TileEntityShuttleDock;
 import de.katzenpapst.amunra.vec.Vector3int;
 import de.katzenpapst.amunra.world.ShuttleDockHandler;
+import de.katzenpapst.amunra.world.WorldHelper;
 import io.netty.buffer.ByteBuf;
+import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase;
 import micdoodle8.mods.galacticraft.api.prefab.entity.EntityTieredRocket;
 import micdoodle8.mods.galacticraft.api.tile.IFuelDock;
 import micdoodle8.mods.galacticraft.api.vector.Vector3;
 import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider;
+import micdoodle8.mods.galacticraft.api.world.IZeroGDimension;
 import micdoodle8.mods.galacticraft.core.GalacticraftCore;
 import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats;
+import micdoodle8.mods.galacticraft.core.tile.TileEntityMulti;
 import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
-import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -46,12 +49,7 @@ public class EntityShuttle extends EntityTieredRocket {
     // so, apparently, there is no real way to figure out when an entity has been dismounted
     protected Entity prevRiddenByEntity = null;
 
-    // NOW TRY THIS
-    // first two bits: num chetsts
-    // next two bits: num tanks
-    // 3 chests and 3 tanks won't be possible, maybe reserve it for the creative rocket
-    // I'll simply won't use prefueled
-
+    protected Vector3int dockPosition = null;
 
     public EntityShuttle(World par1World) {
         super(par1World);
@@ -347,6 +345,19 @@ protected void repositionDismountedPlayer(Entity player) {
         // return new Vector3(this.posX, this.posY, this.posZ);
     }
 
+
+    protected boolean isSafeForPlayer(double x, double y, double z)
+    {
+        int y1 = (int)y;
+
+
+        return WorldHelper.isNonSolid(worldObj, (int)x, y1, (int)z) && WorldHelper.isNonSolid(worldObj, (int)x, y1+1, (int)z) && WorldHelper.isSolid(worldObj, (int)x, y1-1, (int)z, true);
+
+        //return true;
+        //this.worldObj.isAirBlock(x, y, y);
+    }
+
+
     protected void tryFindAnotherDock() {
         Vector3int dock = ShuttleDockHandler.findAvailableDock(this.worldObj.provider.dimensionId);
         if(dock != null) {
@@ -397,12 +408,6 @@ public void onUpdate()
         // handle player dismounting
         if(!worldObj.isRemote) {
 
-            /*if(playerRepositionTicks > 0) {
-                playerRepositionTicks--;
-
-                repositionDismountedPlayer(repositioningEntity);
-            }*/
-
             if(prevRiddenByEntity != riddenByEntity) {
                 if(riddenByEntity == null && prevRiddenByEntity != null) {
                     // seems like someone just dismounted
@@ -502,9 +507,9 @@ public void onUpdate()
         }
 
         if(this.launchPhase == EnumLaunchPhase.UNIGNITED.ordinal()) {
-            if(!doKnowOnWhatImStanding) {
-                checkStandingPosition();
-            }
+
+            checkStandingPosition();
+
         }
     }
 
@@ -521,34 +526,108 @@ protected void checkStandingPosition()
         if(this.worldObj.isRemote) {
             return;
         }
+
+        // recheck this from time to time anyway
+        if(doKnowOnWhatImStanding && this.ticksExisted % 40 != 0) {
+            return;
+        }
+
         if(this.getLandingPad() != null) {
             doKnowOnWhatImStanding = true;
         } else {
+            if(dockPosition != null) {
+                TileEntity tile = worldObj.getTileEntity(dockPosition.x, dockPosition.y, dockPosition.z);
+                if(tile != null) {
+                    if(tile instanceof IFuelDock) {
+                        this.setPad((IFuelDock) tile);
+                        this.landEntity(tile);
+                        dockPosition = null;
+                        return;
+                    } else {
+                        // something went wrong
+                        dockPosition = null;
+                    }
+                }
+            }
+
+            boolean isInZeroG = false;
+            if(this.worldObj.provider instanceof IZeroGDimension) {
+                isInZeroG = true;
+            }
+
             // let's look downward
-            for(int iy=0;iy<5;iy++) {
+            //this.posY is about 3 blocks above the baseline
+            int bX = (int)(this.posX-0.5D);
+            int bY = (int)(this.posY-0.5D-1);
+            int bZ = (int)(this.posZ-0.5D);
+
+            Vector3int highest = WorldHelper.getHighestNonEmptyBlock(worldObj, bX-1, bX+1, bY-5, bY, bZ-1, bZ+1);
+
+            if(highest != null) {
+                TileEntity tileBelow = worldObj.getTileEntity(highest.x, highest.y, highest.z);
+                IFuelDock dockTile = null;
+                if(tileBelow != null) {
+                    if (tileBelow instanceof TileEntityMulti) {
+                        tileBelow = ((TileEntityMulti)tileBelow).getMainBlockTile();
+                    }
+                    if(tileBelow instanceof IFuelDock) {
+                        dockTile = (IFuelDock)tileBelow;
+                    }
+                }
+                if(dockTile != null) {
+                    isOnBareGround = false;
+                    doKnowOnWhatImStanding = true;
+                    if(this.getLandingPad() != dockTile) {
+                        //((IFuelDock) dockTile).dockEntity(this);
+                        this.landEntity((TileEntity)dockTile);
+                        //this.setPad(dockTile);
+                    }
+                } else {
+                    isOnBareGround = true;
+                    doKnowOnWhatImStanding = true;
+                    if(!isInZeroG) {
+                        adjustGroundPosition(highest.y);
+                    }
+                }
+            } else {
+                if(!isInZeroG) {
+                    // make the rocket land
+                    this.setLanding();
+                }
+            }
+        }
+    }
 
-                int bX = (int)(this.posX-0.5D);
-                int bY = (int)(this.posY-0.5D-iy);
-                int bZ = (int)(this.posZ-0.5D);
+    @Override
+    public void landEntity(int x, int y, int z)
+    {
+        TileEntity tile = this.worldObj.getTileEntity(x, y, z);
 
-                Block b = worldObj.getBlock(bX, bY, bZ);
-                //int meta = worldObj.getBlockMetadata((int)(this.posX-0.5D), (int)(this.posY-0.5D-iy), (int)(this.posZ-0.5D));
+        landEntity(tile);
+    }
 
-                if(b.isAir(worldObj, bX, bY, bZ)) {
-                    continue;
-                } else {
-                    // whatever it is, it determines where we are
-                    TileEntity tileBelow = worldObj.getTileEntity(bX, bY, bZ);
-                    if(tileBelow == null || !(tileBelow instanceof IFuelDock)) {
-                        isOnBareGround = true;
-                        doKnowOnWhatImStanding = true;
-                        adjustGroundPosition(bY);
-                    } else {
-                        isOnBareGround = false;
-                        doKnowOnWhatImStanding = true;
+    public void landEntity(TileEntity tile)
+    {
+
+        if (tile instanceof IFuelDock)
+        {
+            IFuelDock dock = (IFuelDock) tile;
+
+            if (this.isDockValid(dock))
+            {
+                if (!this.worldObj.isRemote)
+                {
+                    //Drop any existing rocket on the landing pad
+                    if (dock.getDockedEntity() instanceof EntitySpaceshipBase && dock.getDockedEntity() != this)
+                    {
+                        ((EntitySpaceshipBase)dock.getDockedEntity()).dropShipAsItem();
+                        ((EntitySpaceshipBase)dock.getDockedEntity()).setDead();
                     }
-                    break;
+
+                    this.setPad(dock);
                 }
+
+                this.onRocketLand(tile.xCoord, tile.yCoord, tile.zCoord);
             }
         }
     }
@@ -671,6 +750,13 @@ public List<ItemStack> getCargoContents()
     protected void writeEntityToNBT(NBTTagCompound nbt)
     {
         nbt.setInteger("NumTanks", numTanks);
+
+        if(this.getLandingPad() != null) {
+            Vector3int pos = new Vector3int((TileEntity) this.getLandingPad());
+            nbt.setTag("dockPosition", pos.toNBT());
+            //pos.toNBT()
+        }
+
         super.writeEntityToNBT(nbt);
     }
 
@@ -681,6 +767,13 @@ protected void readEntityFromNBT(NBTTagCompound nbt)
         //this.shuttleMode = EnumShuttleMode.values()[nbt.getInteger("ShuttleMode")];
         //this.setShuttleMode(shuttleMode);
         this.numTanks = nbt.getInteger("NumTanks");
+        if(nbt.hasKey("dockPosition")) {
+            NBTTagCompound dockPosNbt = nbt.getCompoundTag("dockPosition");
+            if(dockPosNbt != null) {
+                dockPosition = new Vector3int(dockPosNbt);
+            }
+        }
+
         super.readEntityFromNBT(nbt);
     }
 
diff --git a/src/main/java/de/katzenpapst/amunra/vec/Vector3int.java b/src/main/java/de/katzenpapst/amunra/vec/Vector3int.java
index 91ffcfc0..71c69246 100755
--- a/src/main/java/de/katzenpapst/amunra/vec/Vector3int.java
+++ b/src/main/java/de/katzenpapst/amunra/vec/Vector3int.java
@@ -3,6 +3,7 @@
 import micdoodle8.mods.galacticraft.api.vector.BlockVec3;
 import micdoodle8.mods.galacticraft.api.vector.Vector3;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 
 public class Vector3int {
 
@@ -28,6 +29,12 @@ public Vector3int(NBTTagCompound nbt) {
         this.z = nbt.getInteger("z");
     }
 
+    public Vector3int(TileEntity tile) {
+        this.x = tile.xCoord;
+        this.y = tile.yCoord;
+        this.z = tile.zCoord;
+    }
+
     public NBTTagCompound toNBT() {
         NBTTagCompound nbt = new NBTTagCompound();
 
diff --git a/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java b/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java
index be241f78..1a09b470 100755
--- a/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java
+++ b/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java
@@ -7,6 +7,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
+import de.katzenpapst.amunra.vec.Vector3int;
 import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
 
 public class WorldHelper {
@@ -111,4 +112,66 @@ public static void setBlockIfFree(World worldObj, int x, int y, int z, Block blo
             worldObj.setBlock(x, y, z, block, meta, 3);
         }
     }
+
+    /**
+     * Returns true if the given block can be walked through. Will probably return false for fluids, too
+     *
+     * @param worldObj
+     * @param x
+     * @param y
+     * @param z
+     * @param checkTop
+     * @return
+     */
+    public static boolean isSolid(World worldObj, int x, int y, int z, boolean checkTop) {
+        Block b = worldObj.getBlock(x, y, z);
+        if(checkTop) {
+            return worldObj.doesBlockHaveSolidTopSurface(worldObj, x, y, z);
+        }
+        // getBlocksMovement returns true when the block does NOT block movement...
+        return !b.getBlocksMovement(worldObj, x, y, z) && b.getMaterial().isSolid();
+    }
+
+    /**
+     * Returns true if the given block can be walked through
+     * @param worldObj
+     * @param x
+     * @param y
+     * @param z
+     * @return
+     */
+    public static boolean isSolid(World worldObj, int x, int y, int z) {
+        return isSolid(worldObj, x, y, z, false);
+    }
+
+    /**
+     * Checks if given block is safe to place the player
+     * @param worldObj
+     * @param x
+     * @param y
+     * @param z
+     * @return
+     */
+    public static boolean isNonSolid(World worldObj, int x, int y, int z) {
+        Block b = worldObj.getBlock(x, y, z);
+
+        // so apparently block.getBlocksMovement does the opposite of what one might expect...
+
+        return b.isAir(worldObj, x, y, z) || (b.getBlocksMovement(worldObj, x, y, z) && !b.getMaterial().isLiquid() && !b.getMaterial().isSolid());
+    }
+
+    public static Vector3int getHighestNonEmptyBlock(World world, int minX, int maxX, int minY, int maxY, int minZ, int maxZ) {
+
+        for(int y = maxY; y >= minY; y--) {
+            for(int x=minX; x<=maxX; x++) {
+                for(int z=minZ; z<=maxZ; z++) {
+                    if(!isNonSolid(world, x, y, z)) {
+                        return new Vector3int(x, y, z);
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
 }

From eb5ca942b44a63b9af12b4056e9b5b88f20cbaa3 Mon Sep 17 00:00:00 2001
From: katzenpapst <praecipitator@gmx.net>
Date: Sat, 3 Jun 2017 16:42:35 +0200
Subject: [PATCH 2/6] improved shuttle dismounting

---
 .../entity/spaceship/EntityShuttle.java       | 22 ++++++++++++++-----
 .../katzenpapst/amunra/world/WorldHelper.java |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java b/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java
index adc25080..7092803d 100755
--- a/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java
+++ b/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java
@@ -339,22 +339,32 @@ protected void repositionDismountedPlayer(Entity player) {
             //player.setPositionAndRotation(pos.x, pos.y, pos.z, 0, 0);
             //player.setPosition(pos.x, pos.y, pos.z);
         } else {
-
-            ((EntityPlayer)player).setPositionAndUpdate(this.posX, this.posY-this.getYOffset(), this.posZ - 2.5D);
+            // try not doing this?
+            // check for safe positions
+            int xPos = (int)(this.posX - 0.5D);
+            int yPos = (int)(this.posY-this.getYOffset());
+            int zPos = (int)(this.posZ - 0.5D);
+
+            if(this.isSafeForPlayer(xPos, yPos, zPos - 2)) {
+                ((EntityPlayer)player).setPositionAndUpdate(this.posX, yPos, this.posZ - 2);
+            } else if(this.isSafeForPlayer(xPos, yPos, zPos + 2)) {
+                ((EntityPlayer)player).setPositionAndUpdate(this.posX, yPos, this.posZ + 2);
+            } else if(this.isSafeForPlayer(xPos - 2, yPos, zPos)) {
+                ((EntityPlayer)player).setPositionAndUpdate(this.posX - 2, yPos, this.posZ);
+            } else if(this.isSafeForPlayer(xPos + 2, yPos, zPos)) {
+                ((EntityPlayer)player).setPositionAndUpdate(this.posX + 2, yPos, this.posZ);
+            }
         }
         // return new Vector3(this.posX, this.posY, this.posZ);
     }
 
 
+
     protected boolean isSafeForPlayer(double x, double y, double z)
     {
         int y1 = (int)y;
 
-
         return WorldHelper.isNonSolid(worldObj, (int)x, y1, (int)z) && WorldHelper.isNonSolid(worldObj, (int)x, y1+1, (int)z) && WorldHelper.isSolid(worldObj, (int)x, y1-1, (int)z, true);
-
-        //return true;
-        //this.worldObj.isAirBlock(x, y, y);
     }
 
 
diff --git a/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java b/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java
index 1a09b470..d825fe94 100755
--- a/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java
+++ b/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java
@@ -108,7 +108,7 @@ public static void setFireToBlock(World worldObj, int x, int y, int z, double fr
     public static void setBlockIfFree(World worldObj, int x, int y, int z, Block block, int meta) {
         Block old = worldObj.getBlock(x, y, z);
         if(old == Blocks.air) {
-            System.out.println("setting "+x+"/"+y+"/"+z+" on fire");
+            //System.out.println("setting "+x+"/"+y+"/"+z+" on fire");
             worldObj.setBlock(x, y, z, block, meta, 3);
         }
     }

From cede0b476f28ff5fceb7b7871fa3303c9f46d636 Mon Sep 17 00:00:00 2001
From: katzenpapst <praecipitator@gmx.net>
Date: Mon, 12 Jun 2017 23:07:51 +0200
Subject: [PATCH 3/6] potentially fixed #43, made the mehen belt brighter

---
 .../katzenpapst/amunra/proxy/ServerProxy.java | 12 ++-
 .../AmunRaAsteroidsChunkProvider.java         | 85 ++++++++++++++++---
 .../world/mehen/MehenChunkProvider.java       | 10 +++
 3 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java b/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java
index 9e10a3d0..0c357d69 100755
--- a/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java
+++ b/src/main/java/de/katzenpapst/amunra/proxy/ServerProxy.java
@@ -10,10 +10,14 @@ public class ServerProxy extends ARSidedProxy {
     @Override
     public void preInit(FMLPreInitializationEvent event)
     {
-        MinecraftServer s = MinecraftServer.getServer();
-        if(s.isDedicatedServer() && !s.isServerInOnlineMode() && AmunRa.config.mothershipUserMatchUUID) {
-            GCLog.info("Server running in offline mode. Setting \"matchUsersByUUID\" to false");
-            AmunRa.config.mothershipUserMatchUUID = false;
+        try {
+            MinecraftServer s = MinecraftServer.getServer();
+            if(s.isDedicatedServer() && !s.isServerInOnlineMode() && AmunRa.config.mothershipUserMatchUUID) {
+                GCLog.info("Server running in offline mode. Setting \"matchUsersByUUID\" to false");
+                AmunRa.config.mothershipUserMatchUUID = false;
+            }
+        } catch (NullPointerException e) {
+            GCLog.info("Could not detect whenever server is in online mode. If it's not, please manually set \"matchUsersByUUID\" to false");
         }
     }
 
diff --git a/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidsChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidsChunkProvider.java
index 982b51d7..5b6f193b 100755
--- a/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidsChunkProvider.java
+++ b/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidsChunkProvider.java
@@ -631,6 +631,31 @@ public boolean chunkExists(int par1, int par2)
         return true;
     }
 
+    /**
+     *
+     * @param world
+     * @param x         start x
+     * @param y
+     * @param z
+     * @param maxLength how far to look max
+     * @param isAir     if true, counts air blocks, if false, counts the NOT airblocks
+     * @return
+     */
+    protected int getCountInNegXDirection(IChunkProvider world, int x, int y, int z, int maxLength, boolean isAir)
+    {
+        int count = 0;
+
+        for(int i=0; i<maxLength;i++) {
+            if((worldObj.getBlock(x - i - 1,  y, z) instanceof BlockAir) == isAir) {
+                count++;
+            } else {
+                break;
+            }
+        }
+
+        return count;
+    }
+
     @Override
     public void populate(IChunkProvider par1IChunkProvider, int chunkX, int chunkZ)
     {
@@ -683,12 +708,23 @@ public void populate(IChunkProvider par1IChunkProvider, int chunkX, int chunkZ)
 
 
                     worldObj.setBlock(px, y, pz, block, meta, 2);
+                    // this does something about the light
+                    // so, the more blocks towards -x are NOT air, the brighter are we?!
                     int count = 7;
-                    if (!(worldObj.getBlock(px - 1,  y, pz) instanceof BlockAir)) count = 1;
-                    else if (!(worldObj.getBlock(px - 2,  y, pz) instanceof BlockAir)) count = 3;
-                    else if (!(worldObj.getBlock(px - 3,  y, pz) instanceof BlockAir)) count = 5;
-                    else if (!(worldObj.getBlock(px - 4,  y, pz) instanceof BlockAir)) count = 6;
-                    worldObj.setLightValue(EnumSkyBlock.Block, px, y, pz, count);
+                    if (!(worldObj.getBlock(px - 1,  y, pz) instanceof BlockAir)) count = 1;//0
+                    else if (!(worldObj.getBlock(px - 2,  y, pz) instanceof BlockAir)) count = 3;//1
+                    else if (!(worldObj.getBlock(px - 3,  y, pz) instanceof BlockAir)) count = 5;//2
+                    else if (!(worldObj.getBlock(px - 4,  y, pz) instanceof BlockAir)) count = 6;//3
+                    /*
+                     * if x-1 is not air, then count is 1
+                     * if x-1 is air, and then count is 3
+                     * if
+                     *
+                     * */
+                    //int blockCount = this.getCountInNegXDirection(par1IChunkProvider, px, y, pz, 4, true);
+                    count = this.adjustBrightnessValue(count);
+
+                    worldObj.setLightValue(EnumSkyBlock.Block, px - 1, y, pz, count);//+1
                 }
             }
         }
@@ -777,6 +813,7 @@ public void populate(IChunkProvider par1IChunkProvider, int chunkX, int chunkZ)
 
     public void generateSkylightMap(Chunk chunk, int cx, int cz)
     {
+        /*
         World w = chunk.worldObj;
         // does this do anything?
         boolean flagXChunk = w.getChunkProvider().chunkExists(cx - 1, cz);
@@ -784,7 +821,7 @@ public void generateSkylightMap(Chunk chunk, int cx, int cz)
         boolean flagZDChunk = w.getChunkProvider().chunkExists(cx, cz - 1);
         boolean flagXZUChunk = w.getChunkProvider().chunkExists(cx - 1, cz + 1);
         boolean flagXZDChunk = w.getChunkProvider().chunkExists(cx - 1, cz - 1);
-
+         */
         for (int j = 0; j < 16; j++)
         {
             if (chunk.getBlockStorageArray()[j] == null) chunk.getBlockStorageArray()[j] = new ExtendedBlockStorage(j << 4, false);
@@ -853,23 +890,29 @@ public void generateSkylightMap(Chunk chunk, int cx, int cz)
                                 if ((chunk.getBlock(x - 3, y, z) instanceof BlockAir)) count+=2;
                                 if ((chunk.getBlock(x - 3, y + 1, z) instanceof BlockAir)) count++;
                                 if ((chunk.getBlock(x - 3, y + 1, z) instanceof BlockAir)) count++;
-                                if ((z > 0 /*|| ((xPos & 15) > 2 ? flagZDChunk : flagXZDChunk)*/) && (chunk.getBlock(x - 3, y, z - 1) instanceof BlockAir)) count++;
-                                if ((z < 15/* || ((xPos & 15) > 2 ? flagZUChunk : flagXZUChunk)*/) && (chunk.getBlock(x - 3, y, z + 1) instanceof BlockAir)) count++;
+                                if ((z > 0 ) && (chunk.getBlock(x - 3, y, z - 1) instanceof BlockAir)) count++;
+                                if ((z < 15) && (chunk.getBlock(x - 3, y, z + 1) instanceof BlockAir)) count++;
                             }
-                            if (/*flagXChunk || */x > 3)
+                            if (x > 3)
                             {
                                 if ((chunk.getBlock(x - 4, y, z) instanceof BlockAir)) count+=2;
                                 if ((chunk.getBlock(x - 4, y + 1, z) instanceof BlockAir)) count++;
                                 if ((chunk.getBlock(x - 4, y + 1, z) instanceof BlockAir)) count++;
-                                if ((z > 0/* || ((xPos & 15) > 3 ? flagZDChunk : flagXZDChunk)*/) && !(chunk.getBlock(x - 4, y, z - 1) instanceof BlockAir)) count++;
-                                if ((z < 15/* || ((xPos & 15) > 3 ? flagZUChunk : flagXZUChunk)*/) && !(chunk.getBlock(x - 4, y, z + 1) instanceof BlockAir)) count++;
+                                if ((z > 0) && !(chunk.getBlock(x - 4, y, z - 1) instanceof BlockAir)) count++;
+                                if ((z < 15) && !(chunk.getBlock(x - 4, y, z + 1) instanceof BlockAir)) count++;
                             }
-                            if (count > 12) count = 12;
-                            chunk.func_150807_a(x - 1, y & 15, z, GCBlocks.brightAir, 15 - count);
+                            // this does something about light, again?
+                            //if (count > 12) count = 12;
+                            count = adjustBrightnessValue(count);
+                            // making the 15 in 15-count lower means brighter?
+                            //count = 0;
+                            // func_150807_a -> 15 = darkest, 0 => brightest
+                            chunk.func_150807_a(x - 1, y, z, GCBlocks.brightAir, 15 - count);
                             ExtendedBlockStorage extendedblockstorage = chunk.getBlockStorageArray()[y >> 4];
                             if (extendedblockstorage != null)
                             {
-                                extendedblockstorage.setExtBlocklightValue(x - 1, y & 15, z, count);
+                                // here it seems to be the opposite
+                                extendedblockstorage.setExtBlocklightValue(x - 1, y & 15, z, count + 2);
                             }
                         }
                     }
@@ -880,6 +923,20 @@ public void generateSkylightMap(Chunk chunk, int cx, int cz)
         chunk.isModified = true;
     }
 
+    /**
+     * higher values = lighter dimension. Probably should not exceed 12
+     * @param count
+     * @return
+     */
+    protected int adjustBrightnessValue(int count)
+    {
+        count += 2;
+
+        if (count > 12) count = 12;
+
+        return count;
+    }
+
     @Override
     public boolean saveChunks(boolean par1, IProgressUpdate par2IProgressUpdate)
     {
diff --git a/src/main/java/de/katzenpapst/amunra/world/mehen/MehenChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/mehen/MehenChunkProvider.java
index fade894d..8c0690ba 100755
--- a/src/main/java/de/katzenpapst/amunra/world/mehen/MehenChunkProvider.java
+++ b/src/main/java/de/katzenpapst/amunra/world/mehen/MehenChunkProvider.java
@@ -45,4 +45,14 @@ protected void initBlockTypes() {
         addBlockToHandler(coreHandler, ARBlocks.blockDarkmatter,    1, .05);
     }
 
+    @Override
+    protected int adjustBrightnessValue(int count)
+    {
+        count += 8;
+
+        if (count > 12) count = 12;
+
+        return count;
+    }
+
 }

From b8057d07a2ecac0a7c1865273aef1e98d3f59047 Mon Sep 17 00:00:00 2001
From: katzenpapst <praecipitator@gmx.net>
Date: Thu, 15 Jun 2017 17:55:10 +0200
Subject: [PATCH 4/6] began overhauling the permission system

---
 .../AbstractBlockMothershipRestricted.java    |  2 +-
 .../MothershipEngineBoosterBase.java          | 24 +++++++++---
 .../MothershipEngineJetBase.java              | 11 ++----
 .../client/gui/GuiShuttleSelection.java       | 14 -------
 .../client/gui/tabs/TabMothershipUsage.java   |  9 +++++
 .../amunra/mothership/Mothership.java         | 18 +++++++--
 .../mothership/MothershipWorldProvider.java   |  8 ++++
 .../amunra/network/packet/PacketSimpleAR.java | 39 ++++++++++++++++++-
 .../tile/TileEntityMothershipSettings.java    |  3 --
 .../resources/assets/amunra/lang/en_US.lang   |  3 +-
 10 files changed, 95 insertions(+), 36 deletions(-)
 create mode 100755 src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java

diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/AbstractBlockMothershipRestricted.java b/src/main/java/de/katzenpapst/amunra/block/machine/AbstractBlockMothershipRestricted.java
index 3fb63925..e31d1b0a 100755
--- a/src/main/java/de/katzenpapst/amunra/block/machine/AbstractBlockMothershipRestricted.java
+++ b/src/main/java/de/katzenpapst/amunra/block/machine/AbstractBlockMothershipRestricted.java
@@ -34,7 +34,7 @@ public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer
     {
         if(world.provider instanceof MothershipWorldProvider) {
 
-            if( ((MothershipWorldProvider)world.provider).isPlayerOwner(entityPlayer) ) {
+            if( ((MothershipWorldProvider)world.provider).isPlayerUsagePermitted(entityPlayer) ) {
                 openGui(world, x, y, z, entityPlayer);
 
                 return true;
diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineBoosterBase.java b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineBoosterBase.java
index 13110c3f..07abd6bd 100755
--- a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineBoosterBase.java
+++ b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineBoosterBase.java
@@ -4,7 +4,7 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.GuiIds;
-import de.katzenpapst.amunra.block.SubBlockMachine;
+import de.katzenpapst.amunra.block.machine.AbstractBlockMothershipRestricted;
 import de.katzenpapst.amunra.vec.Vector3int;
 import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
 import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract;
@@ -17,7 +17,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
-public class MothershipEngineBoosterBase extends SubBlockMachine {
+public class MothershipEngineBoosterBase extends AbstractBlockMothershipRestricted {
 
     protected String activeTextureName;
     protected IIcon activeBlockIcon;
@@ -42,16 +42,28 @@ public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer
         TileEntityMothershipEngineBooster tile = (TileEntityMothershipEngineBooster)leTile;
 
         if(tile.hasMaster()) {
+            return super.onMachineActivated(world, x, y, z, entityPlayer, side, hitX, hitY, hitZ);
+        }
+        return false;
+    }
+
+
+
+    @Override
+    protected void openGui(World world, int x, int y, int z, EntityPlayer entityPlayer) {
+        // try this
+        if(world.isRemote) {
+            return;
+        }
+        TileEntity leTile = world.getTileEntity(x, y, z);
+        if(leTile != null) {
+            TileEntityMothershipEngineBooster tile = (TileEntityMothershipEngineBooster)leTile;
             Vector3int pos = tile.getMasterPosition();
 
             entityPlayer.openGui(AmunRa.instance, GuiIds.GUI_MS_ROCKET_ENGINE, world, pos.x, pos.y, pos.z);
-            return true;
         }
-         return false;
     }
 
-
-
     @Override
     public boolean hasTileEntity(int metadata) {
         return true;
diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineJetBase.java b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineJetBase.java
index 9a2491c4..4b6fcc10 100755
--- a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineJetBase.java
+++ b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineJetBase.java
@@ -6,7 +6,7 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.GuiIds;
-import de.katzenpapst.amunra.block.SubBlockMachine;
+import de.katzenpapst.amunra.block.machine.AbstractBlockMothershipRestricted;
 import de.katzenpapst.amunra.item.ItemDamagePair;
 import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract;
 import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
@@ -18,7 +18,7 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
-public abstract class MothershipEngineJetBase extends SubBlockMachine {
+public abstract class MothershipEngineJetBase extends AbstractBlockMothershipRestricted {
 
     protected String iconTexture;
 
@@ -109,13 +109,10 @@ public boolean renderAsNormalBlock()
         return false;
     }
 
+
     @Override
-    public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
-    {
-        // do the isRemote thing here, too?
+    protected void openGui(World world, int x, int y, int z, EntityPlayer entityPlayer) {
         entityPlayer.openGui(AmunRa.instance, GuiIds.GUI_MS_ROCKET_ENGINE, world, x, y, z);
-        return true;
-        // return false;
     }
 
     @Override
diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java
index 5485d35f..fdf1225f 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java
@@ -357,18 +357,6 @@ protected boolean teleportToSelectedBody()
                     }
                     else
                     {
-                        if(this.selectedBody instanceof Mothership) {
-                            // check if user is allowed
-                            Mothership curMS = (Mothership)this.selectedBody;
-                            // even if the player is not permitted, he will be still allowed to return
-                            int playerDim = mc.thePlayer.worldObj.provider.dimensionId;
-                            if(curMS.getDimensionID() != playerDim && !((Mothership)this.selectedBody).isPlayerPermitted(this.mc.thePlayer)) {
-                                this.showMessageBox(
-                                        GCCoreUtil.translate("gui.message.mothership.permissionError"),
-                                        GCCoreUtil.translateWithFormat("gui.message.mothership.notAllowed", curMS.getOwner().getName()));
-                                return false;
-                            }
-                        }
                         dimensionID = this.selectedBody.getDimensionID();
                     }
                     /*
@@ -381,8 +369,6 @@ protected boolean teleportToSelectedBody()
                     }
                      */
                     AmunRa.packetPipeline.sendToServer(new PacketSimpleAR(PacketSimpleAR.EnumSimplePacket.S_TELEPORT_SHUTTLE, new Object[] { dimensionID }));
-                    //TODO   Some type of clientside "in Space" holding screen here while waiting for the server to do the teleport
-                    //(Otherwise the client will be returned to the destination he was in until now, which looks weird)
                     mc.displayGuiScreen(null);
                     return true;
                 }
diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java
new file mode 100755
index 00000000..a470d719
--- /dev/null
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java
@@ -0,0 +1,9 @@
+package de.katzenpapst.amunra.client.gui.tabs;
+
+public class TabMothershipUsage {
+
+    public TabMothershipUsage() {
+        // TODO Auto-generated constructor stub
+    }
+
+}
diff --git a/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java b/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java
index 7d88bf69..4326d116 100755
--- a/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java
+++ b/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java
@@ -557,25 +557,37 @@ public boolean isPlayerOwner(PlayerID player) {
         return owner.equals(player);
     }
 
+    public boolean isPlayerUsagePermitted(EntityPlayer player) {
+
+        if(player.capabilities.isCreativeMode) {
+            return true;
+        }
+
+        return this.isPlayerLandingPermitted(player);//for now
+    }
+
     /**
      * Returns whenever the given player is permitted to land on this mothership
      *
      * @param player
      * @return
      */
-    public boolean isPlayerPermitted(EntityPlayer player) {
+    public boolean isPlayerLandingPermitted(EntityPlayer player) {
+
+        if(player.capabilities.isCreativeMode) {
+            return true;
+        }
 
         PlayerID playerId = new PlayerID(player);
 
         switch(this.permMode) {
         case ALL:
             return true;
-        case NONE:
-            return this.isPlayerOwner(playerId);
         case BLACKLIST:
             return this.isPlayerOwner(playerId) || !this.playerSet.contains(playerId);
         case WHITELIST:
             return this.isPlayerOwner(playerId) || this.playerSet.contains(playerId);
+        case NONE:
         default:
             return this.isPlayerOwner(playerId);
         }
diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java
index 0ac5476a..e4b9df4e 100755
--- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java
+++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java
@@ -907,6 +907,14 @@ public boolean isPlayerOwner(EntityPlayer player)
         return mothershipObj.isPlayerOwner(player);
     }
 
+    public boolean isPlayerLandingPermitted(EntityPlayer player) {
+        return mothershipObj.isPlayerLandingPermitted(player);
+    }
+
+    public boolean isPlayerUsagePermitted(EntityPlayer player) {
+        return mothershipObj.isPlayerUsagePermitted(player);
+    }
+
     @Override
     public float getGravity() {
         return 0.075F;
diff --git a/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java b/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java
index 4c2eae9e..443a35fd 100755
--- a/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java
+++ b/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java
@@ -218,7 +218,21 @@ public static enum EnumSimplePacket
          * - mothership_id
          * - nbt_data
          */
-        C_MOTHERSHIP_SETTINGS_CHANGED(Side.CLIENT, Integer.class, NBTTagCompound.class);
+        C_MOTHERSHIP_SETTINGS_CHANGED(Side.CLIENT, Integer.class, NBTTagCompound.class),
+
+        /**
+         * Tells the client that a previous S_TELEPORT_SHUTTLE has failed because of a permission error
+         * params:
+         *  - owner_name
+         */
+        C_TELEPORT_SHUTTLE_PERMISSION_ERROR(Side.CLIENT, String.class),
+
+        /**
+         * Tells the client that a previous S_TELEPORT_SHUTTLE has failed for any other random reason
+         * params:
+         *  - error_msg
+         */
+        C_TELEPORT_SHUTTLE_FAIL(Side.CLIENT, String.class);
 
 
 
@@ -464,6 +478,15 @@ public void handleClientSide(EntityPlayer player)
                 ((GuiMothershipSettings)FMLClientHandler.instance().getClient().currentScreen).mothershipResponsePacketRecieved();
             }
             break;
+        case C_TELEPORT_SHUTTLE_PERMISSION_ERROR:
+            if(FMLClientHandler.instance().getClient().currentScreen instanceof GuiShuttleSelection) {
+                String owner = (String) this.data.get(0);
+                ((GuiShuttleSelection)FMLClientHandler.instance().getClient().currentScreen).showMessageBox(
+                        GCCoreUtil.translate("gui.message.mothership.permissionError"),
+                        GCCoreUtil.translateWithFormat("gui.message.mothership.notAllowed", owner)
+                );
+            }
+            break;
         default:
             break;
         } // end of case
@@ -505,14 +528,28 @@ public void handleServerSide(EntityPlayer player)
                 final Integer dim = ((Integer) this.data.get(0));
                 GCLog.info("Will teleport to (" + dim.toString() + ")");
 
+
                 if (playerBase.worldObj instanceof WorldServer)
                 {
+                    mShip = TickHandlerServer.mothershipData.getByDimensionId(dim);
+                    // check if the target is a mothership
+                    if(mShip != null) {
+                        // if the player is currently not on the target MS, check permissions
+                        if(playerBase.dimension != dim && !mShip.isPlayerLandingPermitted(playerBase)) {
+                            AmunRa.packetPipeline.sendTo(new PacketSimpleAR(PacketSimpleAR.EnumSimplePacket.C_TELEPORT_SHUTTLE_PERMISSION_ERROR,
+                                    mShip.getOwner().getName()
+                            ), playerBase);
+                            return;
+                        }
+                    }
+
                     world = (WorldServer) playerBase.worldObj;
                     // replace this now
                     ShuttleTeleportHelper.transferEntityToDimension(playerBase, dim, world);
 
                     stats.teleportCooldown = 10;
                     GalacticraftCore.packetPipeline.sendTo(new PacketSimple(PacketSimple.EnumSimplePacket.C_CLOSE_GUI, new Object[] { }), playerBase);
+
                 }
             }
             catch (final Exception e)
diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipSettings.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipSettings.java
index c9a61940..9eb5fe90 100755
--- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipSettings.java
+++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipSettings.java
@@ -84,9 +84,6 @@ public boolean isUseableByPlayer(EntityPlayer par1EntityPlayer) {
             return false;
         }
 
-        if(!((MothershipWorldProvider)worldObj.provider).isPlayerOwner(par1EntityPlayer)) {
-            return false;
-        }
         return
             this.worldObj.getTileEntity(this.xCoord, this.yCoord, this.zCoord) == this &&
                 par1EntityPlayer.getDistanceSq(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D) <= 64.0D;
diff --git a/src/main/resources/assets/amunra/lang/en_US.lang b/src/main/resources/assets/amunra/lang/en_US.lang
index 06fe59ff..4081d12e 100755
--- a/src/main/resources/assets/amunra/lang/en_US.lang
+++ b/src/main/resources/assets/amunra/lang/en_US.lang
@@ -261,6 +261,7 @@ gui.message.mothership.notAllowed=You are not allowed to land on this mothership
 gui.message.mothership.permissionError=Permission error
 gui.message.mothership.chat.wrongUser=You are not allowed to use this mothership.
 gui.message.mothership.chat.notOnShip=This must be placed on a mothership.
+gui.message.shuttle.transferFailed=Shuttle Transfer failed
 gui.message.dock.status.obstructed=There are blocks in the way.$Shuttles cannot dock here.
 gui.message.dock.status.occupied=A shuttle is docked here.
 gui.message.dock.status.free=This dock is vacant.
@@ -277,7 +278,7 @@ info.message.celestialbodysearch.none=No celestial bodies matching '%s' found
 info.message.celestialbodysearch.some=Found %s celestial bodies matching '%s':
 
 
-
+gui.message.misc.generalErrorCaption=Error
 gui.message.misc.planet=Planet
 gui.message.misc.star=Star
 gui.message.misc.moon=Moon

From ec68829a63b2979ef0a67c4d2766ad4bb0a7bf01 Mon Sep 17 00:00:00 2001
From: katzenpapst <praecipitator@gmx.net>
Date: Wed, 21 Jun 2017 23:35:58 +0200
Subject: [PATCH 5/6] permission system fixed. closes #41

---
 .../amunra/client/gui/GuiContainerTabbed.java |   2 +-
 .../client/gui/GuiMothershipSettings.java     |  10 +-
 .../amunra/client/gui/elements/TabButton.java |  54 +++++-----
 ...ission.java => AbstractPermissionTab.java} |  92 ++++++------------
 .../amunra/client/gui/tabs/AbstractTab.java   |   5 +
 .../client/gui/tabs/TabMothershipLanding.java |  83 ++++++++++++++++
 .../client/gui/tabs/TabMothershipUsage.java   |  79 ++++++++++++++-
 .../amunra/mothership/Mothership.java         |  92 ++++++++++++++----
 .../amunra/network/packet/PacketSimpleAR.java |  31 ++++--
 .../resources/assets/amunra/lang/de_DE.lang   |   4 +
 .../resources/assets/amunra/lang/en_US.lang   |   4 +
 .../resources/assets/amunra/lang/pl_PL.lang   |  22 +++--
 .../resources/assets/amunra/lang/ru_RU.lang   |   4 +
 .../amunra/textures/blocks/controller.png     | Bin 4077 -> 4074 bytes
 .../textures/gui/landing-permission.png       | Bin 0 -> 626 bytes
 .../amunra/textures/gui/usage-permission.png  | Bin 0 -> 845 bytes
 16 files changed, 348 insertions(+), 134 deletions(-)
 rename src/main/java/de/katzenpapst/amunra/client/gui/tabs/{TabMothershipPermission.java => AbstractPermissionTab.java} (67%)
 create mode 100755 src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipLanding.java
 create mode 100755 src/main/resources/assets/amunra/textures/gui/landing-permission.png
 create mode 100755 src/main/resources/assets/amunra/textures/gui/usage-permission.png

diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiContainerTabbed.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiContainerTabbed.java
index 4615c98b..bc6ab8f2 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiContainerTabbed.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiContainerTabbed.java
@@ -47,7 +47,7 @@ public int addTab(AbstractTab tab)
             final int guiY = (this.height - this.ySize) / 2;
 
             // add button
-            TabButton test = new TabButton(TAB_BTN_OFFSET+newIndex, guiX-27, guiY+6 + newIndex*28, tab.getTooltip(), tab.getIcon());
+            TabButton test = new TabButton(TAB_BTN_OFFSET+newIndex, guiX-27, guiY+6 + newIndex*28, tab.getTooltip(), tab.getTooltipDescription(), tab.getIcon());
             this.buttonList.add(test);
             this.tabButtons.add(test);
 
diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiMothershipSettings.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiMothershipSettings.java
index 33a9052d..81a9c22d 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiMothershipSettings.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiMothershipSettings.java
@@ -7,7 +7,8 @@
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.client.gui.tabs.AbstractTab;
 import de.katzenpapst.amunra.client.gui.tabs.TabMothershipCustom;
-import de.katzenpapst.amunra.client.gui.tabs.TabMothershipPermission;
+import de.katzenpapst.amunra.client.gui.tabs.TabMothershipLanding;
+import de.katzenpapst.amunra.client.gui.tabs.TabMothershipUsage;
 import de.katzenpapst.amunra.inventory.ContainerMothershipSettings;
 import de.katzenpapst.amunra.mothership.Mothership;
 import de.katzenpapst.amunra.network.packet.PacketSimpleAR;
@@ -30,8 +31,6 @@ public interface IMothershipSettingsTab {
     private final TileEntityMothershipSettings tile;
     private Mothership ship;
 
-    private int customizeTabIndex;
-
     protected List<ResourceLocation> mothershipTextures;
 
     public GuiMothershipSettings(InventoryPlayer par1InventoryPlayer, TileEntityMothershipSettings tile) {
@@ -83,8 +82,9 @@ public void initGui()
     {
         super.initGui();
 
-        customizeTabIndex = this.addTab(new TabMothershipCustom(tile, this, mc, width, height, xSize, ySize));
-        this.addTab(new TabMothershipPermission(tile, this, mc, width, height, xSize, ySize));
+        this.addTab(new TabMothershipCustom(tile, this, mc, width, height, xSize, ySize));
+        this.addTab(new TabMothershipLanding(tile, this, mc, width, height, xSize, ySize));
+        this.addTab(new TabMothershipUsage(tile, this, mc, width, height, xSize, ySize));
 
     }
 
diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/elements/TabButton.java b/src/main/java/de/katzenpapst/amunra/client/gui/elements/TabButton.java
index c697c9c9..9f9bf588 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/elements/TabButton.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/elements/TabButton.java
@@ -1,11 +1,14 @@
 package de.katzenpapst.amunra.client.gui.elements;
 
+import java.util.List;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import de.katzenpapst.amunra.AmunRa;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderHelper;
@@ -20,6 +23,8 @@ public class TabButton extends GuiButton {
 
     protected final ResourceLocation texture;
 
+    protected String extraInfo = null;
+
     public TabButton(int id, int xPos, int yPos, String displayString, ResourceLocation texture) {
         super(id, xPos, yPos, displayString);
 
@@ -28,6 +33,12 @@ public TabButton(int id, int xPos, int yPos, String displayString, ResourceLocat
         this.texture = texture;
     }
 
+    public TabButton(int id, int xPos, int yPos, String displayString, String infoString, ResourceLocation texture) {
+        this(id, xPos, yPos, displayString, texture);
+
+        extraInfo = infoString;
+    }
+
     /**
      * Draws this button to the screen.
      */
@@ -106,44 +117,26 @@ public void drawTooltip(int mouseX, int mouseY)
         GL11.glDisable(GL11.GL_DEPTH_TEST);
 
         boolean withinRegion = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
-
+        List<String> extraStrings = null;
 
 
         if (this.displayString != null && !this.displayString.isEmpty() && withinRegion)
         {
+            FontRenderer fontRenderer = FMLClientHandler.instance().getClient().fontRenderer;
             int stringWidth = FMLClientHandler.instance().getClient().fontRenderer.getStringWidth(displayString);
-            /*Iterator<String> iterator = this.tooltipStrings.iterator();
 
-            while (iterator.hasNext())
-            {
-                String s = iterator.next();
-                int l = FMLClientHandler.instance().getClient().fontRenderer.getStringWidth(s);
 
-                if (l > k)
-                {
-                    k = l;
-                }
-            }*/
 
             int tooltipX = mouseX + 12;
             int tooltipY = mouseY - 12;
             int stringHeight = 8;
-/*
-            if (this.tooltipStrings.size() > 1)
-            {
-                k1 += (this.tooltipStrings.size() - 1) * 10;
-            }
 
-            if (i1 + k > this.parentWidth)
-            {
-                i1 -= 28 + k;
+            if(this.extraInfo != null) {
+                stringWidth = Math.max(stringWidth, 150);
+                extraStrings = fontRenderer.listFormattedStringToWidth(extraInfo, stringWidth);
+                stringHeight += extraStrings.size() * 10;
             }
 
-            if (this.parentGui.getTooltipOffset(par2, par3) > 0)
-            {
-                j1 -= k1 + 9;
-            }
-*/
             this.zLevel = 300.0F;
             //GuiElementInfoRegion.itemRenderer.zLevel = 300.0F;
             int colorSomething = -267386864;
@@ -159,7 +152,18 @@ public void drawTooltip(int mouseX, int mouseY)
             this.drawGradientRect(tooltipX - 3, tooltipY - 3, tooltipX + stringWidth + 3, tooltipY - 3 + 1, otherColorSomething, otherColorSomething);
             this.drawGradientRect(tooltipX - 3, tooltipY + stringHeight + 2, tooltipX + stringWidth + 3, tooltipY + stringHeight + 3, j2, j2);
 
-            FMLClientHandler.instance().getClient().fontRenderer.drawStringWithShadow(displayString, tooltipX, tooltipY, -1);
+            fontRenderer.drawStringWithShadow(displayString, tooltipX, tooltipY, -1);
+
+            //EnumColor.RED
+
+
+            if(extraStrings != null) {
+                for(int i=0;i<extraStrings.size();i++) {
+                    fontRenderer.drawStringWithShadow(extraStrings.get(i), tooltipX, tooltipY+(i+1)*10, 0x7777FF);
+                }
+            }
+
+
 
             this.zLevel = 0.0F;
             //GuiElementInfoRegion.itemRenderer.zLevel = 0.0F;
diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipPermission.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractPermissionTab.java
similarity index 67%
rename from src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipPermission.java
rename to src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractPermissionTab.java
index 6bb5776c..669ac3b0 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipPermission.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractPermissionTab.java
@@ -1,53 +1,48 @@
 package de.katzenpapst.amunra.client.gui.tabs;
 
+
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
-import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.client.gui.GuiMothershipSettings;
 import de.katzenpapst.amunra.client.gui.GuiMothershipSettings.IMothershipSettingsTab;
 import de.katzenpapst.amunra.client.gui.elements.StringSelectBox;
 import de.katzenpapst.amunra.client.gui.elements.StringSelectBox.ISelectBoxCallback;
 import de.katzenpapst.amunra.helper.PlayerID;
 import de.katzenpapst.amunra.mothership.Mothership;
-import de.katzenpapst.amunra.mothership.Mothership.PermissionMode;
-import de.katzenpapst.amunra.network.packet.PacketSimpleAR;
-import de.katzenpapst.amunra.network.packet.PacketSimpleAR.EnumSimplePacket;
 import de.katzenpapst.amunra.tile.TileEntityMothershipSettings;
 import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown;
 import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox;
-import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox.ITextBoxCallback;
 import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown.IDropboxCallback;
+import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox.ITextBoxCallback;
 import micdoodle8.mods.galacticraft.core.util.ColorUtil;
 import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.ResourceLocation;
 
-public class TabMothershipPermission extends AbstractTab implements IDropboxCallback, ITextBoxCallback, ISelectBoxCallback, IMothershipSettingsTab {
+abstract public class AbstractPermissionTab extends AbstractTab implements IDropboxCallback, ITextBoxCallback, ISelectBoxCallback, IMothershipSettingsTab {
 
-    protected static final ResourceLocation icon = new ResourceLocation(AmunRa.ASSETPREFIX, "textures/gui/permission.png");
 
-    private final TileEntityMothershipSettings tile;
+    protected final TileEntityMothershipSettings tile;
 
-    private GuiElementDropdown modeDropdown;
-    private GuiElementTextBox textBoxUsername;
-    private StringSelectBox selectBox;
+    protected GuiElementDropdown modeDropdown;
+    protected GuiElementTextBox textBoxUsername;
+    protected StringSelectBox selectBox;
 
-    private GuiButton addBtn;
-    private GuiButton rmBtn;
+    protected GuiButton addBtn;
+    protected GuiButton rmBtn;
 
-    private Set<PlayerID> playerIdList =  new HashSet<PlayerID>();
+    //protected Set<PlayerID> playerIdList =  new HashSet<PlayerID>();
+    protected List<PlayerID> playerIdList = new ArrayList<PlayerID>();
 
-    private Map<Mothership.PermissionMode, String> permissionModeMap = new HashMap<Mothership.PermissionMode, String>();
+    protected Map<Mothership.PermissionMode, String> permissionModeMap = new HashMap<Mothership.PermissionMode, String>();
 
-    private String error = "";
-    private float errorTime = 0;
+    protected String error = "";
+    protected float errorTime = 0;
 
-    public TabMothershipPermission(TileEntityMothershipSettings tile, GuiMothershipSettings parent, Minecraft mc, int width, int height, int xSize, int ySize) {
+    public AbstractPermissionTab(TileEntityMothershipSettings tile, GuiMothershipSettings parent, Minecraft mc, int width, int height, int xSize, int ySize) {
         super(parent, mc, width, height, xSize, ySize);
         this.tile = tile;
 
@@ -57,12 +52,17 @@ public TabMothershipPermission(TileEntityMothershipSettings tile, GuiMothershipS
         permissionModeMap.put(Mothership.PermissionMode.BLACKLIST, GCCoreUtil.translate("tile.mothershipSettings.permission.blacklist"));
     }
 
+    protected abstract void addUsername(Mothership mothership, String userName);
+
+    protected abstract void removeUsernameFromList(int position);
+
     @Override
     public boolean actionPerformed(GuiButton btn)
     {
         if(btn == addBtn) {
             //
-            AmunRa.packetPipeline.sendToServer(new PacketSimpleAR(EnumSimplePacket.S_ADD_MOTHERSHIP_PLAYER, this.tile.getMothership().getID(), textBoxUsername.text));
+            // AmunRa.packetPipeline.sendToServer(new PacketSimpleAR(EnumSimplePacket.S_ADD_MOTHERSHIP_PLAYER, this.tile.getMothership().getID(), textBoxUsername.text));
+            addUsername(this.tile.getMothership(), textBoxUsername.text);
             textBoxUsername.text = "";
             addBtn.enabled = false;
             return true;
@@ -70,9 +70,8 @@ public boolean actionPerformed(GuiButton btn)
         if(btn == rmBtn) {
             int selection = selectBox.getSelectedStringIndex();
             if(selection != -1) {
-                playerIdList.remove(selection);
+                removeUsernameFromList(selection);
                 selectBox.clearSelection();
-                tile.getMothership().setPlayerSet(playerIdList);
                 applyData();
             }
             return true;
@@ -80,23 +79,14 @@ public boolean actionPerformed(GuiButton btn)
         return false;
     }
 
-    public void resetData() {
-        Mothership.PermissionMode pm = this.tile.getMothership().getPermissionMode();
-        modeDropdown.selectedOption = pm.ordinal();
-        playerIdList = this.tile.getMothership().getPlayerList();
-        selectBox.clear();
-        for(PlayerID pid: playerIdList) {
-            selectBox.addString(pid.getName());
-        }
-    }
+    abstract public void resetData();
 
     @Override
     public void mothershipResponsePacketRecieved() {
-        // T
         resetData();
     }
 
-    private String[] getDropdownOptions() {
+    protected String[] getDropdownOptions() {
         int num = Mothership.PermissionMode.values().length;
         String[] result = new String[num];
 
@@ -107,10 +97,8 @@ private String[] getDropdownOptions() {
         return result;
     }
 
-    private void applyData() {
+    protected void applyData() {
         GuiMothershipSettings actualParent = ((GuiMothershipSettings) this.parent);
-        /*tile.getMothership().setPlayerList(playerIdList);
-        tile.getMothership().setPermissionMode(mode);*/
         actualParent.sendMothershipSettingsPacket();
     }
 
@@ -170,16 +158,6 @@ protected void drawExtraScreenElements(int mouseX, int mouseY, float ticks)
         this.fontRendererObj.drawString(GCCoreUtil.translate("container.inventory"), guiX+8, guiY+this.ySize - 94, 4210752);
     }
 
-    @Override
-    public ResourceLocation getIcon() {
-        return icon;
-    }
-
-    @Override
-    public String getTooltip() {
-        return GCCoreUtil.translate("tile.mothershipSettings.permission");
-    }
-
     // DROPDOWN SHIT
     @Override
     public boolean canBeClickedBy(GuiElementDropdown dropdown, EntityPlayer player) {
@@ -187,19 +165,7 @@ public boolean canBeClickedBy(GuiElementDropdown dropdown, EntityPlayer player)
     }
 
     @Override
-    public void onSelectionChanged(GuiElementDropdown dropdown, int selection) {
-        if(dropdown == modeDropdown) {
-            PermissionMode mode = PermissionMode.values()[selection];
-            tile.getMothership().setPermissionMode(mode);
-            this.applyData();
-        }
-
-    }
-
-    @Override
-    public int getInitialSelection(GuiElementDropdown dropdown) {
-        return this.tile.getMothership().getPermissionMode().ordinal();
-    }
+    abstract public int getInitialSelection(GuiElementDropdown dropdown);
 
     @Override
     public void onIntruderInteraction() {
@@ -221,7 +187,6 @@ public void onTextChanged(GuiElementTextBox textBox, String newText) {
     @Override
     public String getInitialText(GuiElementTextBox textBox) {
         return "";
-        //return "";
     }
 
     @Override
@@ -246,4 +211,5 @@ public void mothershipOperationFailed(String message) {
         errorTime = 60.0F;
     }
 
+
 }
diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractTab.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractTab.java
index 051d0570..f85e99e5 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractTab.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractTab.java
@@ -260,4 +260,9 @@ public void onTabActivated() {}
     abstract public ResourceLocation getIcon();
 
     abstract public String getTooltip();
+
+    public String getTooltipDescription()
+    {
+        return null;
+    }
 }
diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipLanding.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipLanding.java
new file mode 100755
index 00000000..a7460840
--- /dev/null
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipLanding.java
@@ -0,0 +1,83 @@
+package de.katzenpapst.amunra.client.gui.tabs;
+
+import de.katzenpapst.amunra.AmunRa;
+import de.katzenpapst.amunra.client.gui.GuiMothershipSettings;
+import de.katzenpapst.amunra.helper.PlayerID;
+import de.katzenpapst.amunra.mothership.Mothership;
+import de.katzenpapst.amunra.mothership.Mothership.PermissionMode;
+import de.katzenpapst.amunra.network.packet.PacketSimpleAR;
+import de.katzenpapst.amunra.network.packet.PacketSimpleAR.EnumSimplePacket;
+import de.katzenpapst.amunra.tile.TileEntityMothershipSettings;
+import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown;
+import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ResourceLocation;
+
+public class TabMothershipLanding extends AbstractPermissionTab {
+
+    protected static final ResourceLocation icon = new ResourceLocation(AmunRa.ASSETPREFIX, "textures/gui/landing-permission.png");
+
+    public TabMothershipLanding(TileEntityMothershipSettings tile, GuiMothershipSettings parent, Minecraft mc, int width, int height, int xSize, int ySize) {
+        super(tile, parent, mc, width, height, xSize, ySize);
+    }
+
+    @Override
+    public void resetData() {
+        Mothership.PermissionMode pm = this.tile.getMothership().getLandingPermissionMode();
+        modeDropdown.selectedOption = pm.ordinal();
+        playerIdList.clear();
+
+        Mothership m = this.tile.getMothership();
+
+        playerIdList.addAll(m.getPlayerListLanding());
+        selectBox.clear();
+        for(PlayerID pid: playerIdList) {
+            selectBox.addString(pid.getName());
+        }
+    }
+
+    @Override
+    public ResourceLocation getIcon() {
+        return icon;
+    }
+
+    @Override
+    public String getTooltip() {
+        return GCCoreUtil.translate("tile.mothershipSettings.permissionLand");
+    }
+
+    @Override
+    public void onSelectionChanged(GuiElementDropdown dropdown, int selection) {
+        if(dropdown == modeDropdown) {
+            PermissionMode mode = PermissionMode.values()[selection];
+            tile.getMothership().setLandingPermissionMode(mode);
+            this.applyData();
+        }
+
+    }
+
+    @Override
+    public int getInitialSelection(GuiElementDropdown dropdown) {
+        return this.tile.getMothership().getLandingPermissionMode().ordinal();
+    }
+
+    @Override
+    protected void addUsername(Mothership mothership, String userName) {
+        AmunRa.packetPipeline.sendToServer(new PacketSimpleAR(
+                EnumSimplePacket.S_ADD_MOTHERSHIP_PLAYER,
+                this.tile.getMothership().getID(),
+                textBoxUsername.text, 0));
+    }
+
+    @Override
+    protected void removeUsernameFromList(int position) {
+        playerIdList.remove(position);
+        tile.getMothership().setPlayerListLanding(playerIdList);
+    }
+
+    @Override
+    public String getTooltipDescription()
+    {
+        return GCCoreUtil.translate("tile.mothershipSettings.permissionLandDesc");
+    }
+}
diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java
index a470d719..e46a3308 100755
--- a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java
+++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java
@@ -1,9 +1,82 @@
 package de.katzenpapst.amunra.client.gui.tabs;
 
-public class TabMothershipUsage {
+import de.katzenpapst.amunra.AmunRa;
+import de.katzenpapst.amunra.client.gui.GuiMothershipSettings;
+import de.katzenpapst.amunra.helper.PlayerID;
+import de.katzenpapst.amunra.mothership.Mothership;
+import de.katzenpapst.amunra.mothership.Mothership.PermissionMode;
+import de.katzenpapst.amunra.network.packet.PacketSimpleAR;
+import de.katzenpapst.amunra.network.packet.PacketSimpleAR.EnumSimplePacket;
+import de.katzenpapst.amunra.tile.TileEntityMothershipSettings;
+import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown;
+import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ResourceLocation;
 
-    public TabMothershipUsage() {
-        // TODO Auto-generated constructor stub
+public class TabMothershipUsage extends AbstractPermissionTab {
+
+    protected static final ResourceLocation icon = new ResourceLocation(AmunRa.ASSETPREFIX, "textures/gui/usage-permission.png");
+
+    public TabMothershipUsage(TileEntityMothershipSettings tile, GuiMothershipSettings parent, Minecraft mc, int width, int height, int xSize, int ySize) {
+        super(tile, parent, mc, width, height, xSize, ySize);
+    }
+
+    @Override
+    public void resetData() {
+        Mothership.PermissionMode pm = this.tile.getMothership().getUsagePermissionMode();
+        modeDropdown.selectedOption = pm.ordinal();
+        playerIdList.clear();
+
+        Mothership m = this.tile.getMothership();
+
+        playerIdList.addAll(m.getPlayerListUsage());
+        selectBox.clear();
+        for(PlayerID pid: playerIdList) {
+            selectBox.addString(pid.getName());
+        }
+    }
+
+    @Override
+    public ResourceLocation getIcon() {
+        return icon;
+    }
+
+    @Override
+    public String getTooltip() {
+        return GCCoreUtil.translate("tile.mothershipSettings.permissionUse");
     }
 
+    @Override
+    public void onSelectionChanged(GuiElementDropdown dropdown, int selection) {
+        if(dropdown == modeDropdown) {
+            PermissionMode mode = PermissionMode.values()[selection];
+            tile.getMothership().setUsagePermissionMode(mode);
+            this.applyData();
+        }
+    }
+
+    @Override
+    public int getInitialSelection(GuiElementDropdown dropdown) {
+        return this.tile.getMothership().getUsagePermissionMode().ordinal();
+    }
+
+    @Override
+    protected void addUsername(Mothership mothership, String userName) {
+        AmunRa.packetPipeline.sendToServer(new PacketSimpleAR(
+                EnumSimplePacket.S_ADD_MOTHERSHIP_PLAYER,
+                this.tile.getMothership().getID(),
+                textBoxUsername.text, 1));
+    }
+
+    @Override
+    protected void removeUsernameFromList(int position) {
+        playerIdList.remove(position);
+        tile.getMothership().setPlayerListUsage(playerIdList);
+    }
+
+    @Override
+    public String getTooltipDescription()
+    {
+        return GCCoreUtil.translate("tile.mothershipSettings.permissionUseDesc");
+    }
 }
diff --git a/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java b/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java
index 4326d116..122313b1 100755
--- a/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java
+++ b/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java
@@ -43,9 +43,11 @@ public enum PermissionMode {
 
     // protected List<PlayerID> playerList = new ArrayList<PlayerID>();
 
-    protected Set<PlayerID> playerSet = new HashSet<PlayerID>();
+    protected Set<PlayerID> playerSetLanding = new HashSet<PlayerID>();
+    protected Set<PlayerID> playerSetUsage = new HashSet<PlayerID>();
 
-    protected PermissionMode permMode = PermissionMode.NONE;
+    protected PermissionMode permModeLanding = PermissionMode.NONE;
+    protected PermissionMode permModeUsage   = PermissionMode.NONE;
 
     protected PlayerID owner;
 
@@ -93,24 +95,47 @@ public boolean setParent(CelestialBody parent) {
         return true;
     }
 
-    public Set<PlayerID> getPlayerList() {
-        return playerSet;
+    public Set<PlayerID> getPlayerListLanding() {
+        return playerSetLanding;
     }
 
-    public void addPlayerToList(PlayerID pi) {
-        playerSet.add(pi);
+    public void addPlayerToListLanding(PlayerID pi) {
+        playerSetLanding.add(pi);
     }
 
-    public void setPlayerSet(Set<PlayerID> list) {
-        playerSet = list;
+    public void setPlayerListLanding(Collection<PlayerID> list) {
+        playerSetLanding.clear();
+        playerSetLanding.addAll(list);
+        //playerSetLanding = list;
     }
 
-    public PermissionMode getPermissionMode() {
-        return this.permMode;
+    public Set<PlayerID> getPlayerListUsage() {
+        return playerSetUsage;
     }
 
-    public void setPermissionMode(PermissionMode mode) {
-        this.permMode = mode;
+    public void addPlayerToListUsage(PlayerID pi) {
+        playerSetUsage.add(pi);
+    }
+
+    public void setPlayerListUsage(Collection<PlayerID> list) {
+        playerSetUsage.clear();
+        playerSetUsage.addAll(list);
+    }
+
+    public PermissionMode getLandingPermissionMode() {
+        return this.permModeLanding;
+    }
+
+    public void setLandingPermissionMode(PermissionMode mode) {
+        this.permModeLanding = mode;
+    }
+
+    public PermissionMode getUsagePermissionMode() {
+        return this.permModeUsage;
+    }
+
+    public void setUsagePermissionMode(PermissionMode mode) {
+        this.permModeUsage = mode;
     }
 
     @Override
@@ -492,17 +517,30 @@ public void readSettingsFromNBT(NBTTagCompound data) {
         }
 
         NBTTagList list = data.getTagList("playerList", Constants.NBT.TAG_COMPOUND);
-        playerSet.clear();
+        playerSetLanding = new HashSet<PlayerID>();
         //playerList.clear();
         for(int i=0;i<list.tagCount();i++) {
             NBTTagCompound playerData = list.getCompoundTagAt(i);
             PlayerID pd = new PlayerID(playerData);
-            playerSet.add(pd);
+            playerSetLanding.add(pd);
         }
 
         if(data.hasKey("permissionMode")) {
             int modeIndex = data.getInteger("permissionMode");
-            permMode = PermissionMode.values()[modeIndex];
+            permModeLanding = PermissionMode.values()[modeIndex];
+        }
+
+        list = data.getTagList("playerListUse", Constants.NBT.TAG_COMPOUND);
+        playerSetUsage = new HashSet<PlayerID>();
+        for(int i=0;i<list.tagCount();i++) {
+            NBTTagCompound playerData = list.getCompoundTagAt(i);
+            PlayerID pd = new PlayerID(playerData);
+            playerSetUsage.add(pd);
+        }
+
+        if(data.hasKey("permissionModeUse")) {
+            int modeIndex = data.getInteger("permissionModeUse");
+            permModeUsage = PermissionMode.values()[modeIndex];
         }
     }
 
@@ -512,12 +550,20 @@ public void writeSettingsToNBT(NBTTagCompound data) {
 
         NBTTagList list = new NBTTagList();
 
-        for(PlayerID p: playerSet) {
+        for(PlayerID p: playerSetLanding) {
             list.appendTag(p.getNbt());
         }
         data.setTag("playerList", list);
 
-        data.setInteger("permissionMode", this.permMode.ordinal());
+        list = new NBTTagList();
+
+        for(PlayerID p: playerSetUsage) {
+            list.appendTag(p.getNbt());
+        }
+        data.setTag("playerListUse", list);
+
+        data.setInteger("permissionMode", this.permModeLanding.ordinal());
+        data.setInteger("permissionModeUse", this.permModeUsage.ordinal());
     }
 
     public long getTotalTravelTime() {
@@ -563,7 +609,7 @@ public boolean isPlayerUsagePermitted(EntityPlayer player) {
             return true;
         }
 
-        return this.isPlayerLandingPermitted(player);//for now
+        return isPlayerPermitted(player, permModeUsage);
     }
 
     /**
@@ -578,15 +624,19 @@ public boolean isPlayerLandingPermitted(EntityPlayer player) {
             return true;
         }
 
+        return isPlayerPermitted(player, permModeLanding);
+    }
+
+    protected boolean isPlayerPermitted(EntityPlayer player, PermissionMode mode) {
         PlayerID playerId = new PlayerID(player);
 
-        switch(this.permMode) {
+        switch(this.permModeLanding) {
         case ALL:
             return true;
         case BLACKLIST:
-            return this.isPlayerOwner(playerId) || !this.playerSet.contains(playerId);
+            return this.isPlayerOwner(playerId) || !this.playerSetLanding.contains(playerId);
         case WHITELIST:
-            return this.isPlayerOwner(playerId) || this.playerSet.contains(playerId);
+            return this.isPlayerOwner(playerId) || this.playerSetLanding.contains(playerId);
         case NONE:
         default:
             return this.isPlayerOwner(playerId);
diff --git a/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java b/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java
index 443a35fd..73fc6329 100755
--- a/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java
+++ b/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java
@@ -5,7 +5,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
@@ -108,10 +107,11 @@ public static enum EnumSimplePacket
         /**
          * Sends a username to the server and hopes that the server finds a user by that name
          * params:
-         * - mothership_id:
+         * - mothership_id
          * - player_name
+         * - type
          */
-        S_ADD_MOTHERSHIP_PLAYER(Side.SERVER, Integer.class, String.class),
+        S_ADD_MOTHERSHIP_PLAYER(Side.SERVER, Integer.class, String.class, Integer.class),
 
 
         /**
@@ -492,6 +492,15 @@ public void handleClientSide(EntityPlayer player)
         } // end of case
     }
 
+    private PlayerID getPlayerIdByName(WorldServer world, String name)
+    {
+        EntityPlayer otherPlayer = world.getPlayerEntityByName(name);
+        if(otherPlayer == null) {
+            return null;
+        }
+        return new PlayerID(otherPlayer);
+    }
+
     @Override
     public void handleServerSide(EntityPlayer player)
     {
@@ -636,16 +645,24 @@ public void handleServerSide(EntityPlayer player)
         case S_ADD_MOTHERSHIP_PLAYER:
             mothershipId = (Integer) this.data.get(0);
             String name = (String)this.data.get(1);
+            int type = (Integer) this.data.get(2);
             mShip = TickHandlerServer.mothershipData.getByMothershipId(mothershipId);
             if (playerBase.worldObj instanceof WorldServer)
             {
                 world = (WorldServer) playerBase.worldObj;
-                EntityPlayer otherPlayer = world.getPlayerEntityByName(name);
-                if(otherPlayer != null) {
-                    if(otherPlayer.equals(player)) {
+
+                PlayerID playerId = getPlayerIdByName(world, name);
+
+                //EntityPlayer otherPlayer = world.getPlayerEntityByName(name);
+                if(playerId != null) {
+                    if(playerId.equals(player)) {
                         AmunRa.packetPipeline.sendTo(new PacketSimpleAR(PacketSimpleAR.EnumSimplePacket.C_ADD_MOTHERSHIP_PLAYER_FAILED, "tile.mothershipSettings.permission.addUserErrorSelf", name), playerBase);
                     } else {
-                        mShip.addPlayerToList(new PlayerID(otherPlayer));
+                        if(type == 0) {
+                            mShip.addPlayerToListLanding(playerId);
+                        } else if(type == 1) {
+                            mShip.addPlayerToListUsage(playerId);
+                        }
                         nbt = new NBTTagCompound ();
                         mShip.writeSettingsToNBT(nbt);
                         AmunRa.packetPipeline.sendToAll(new PacketSimpleAR(PacketSimpleAR.EnumSimplePacket.C_MOTHERSHIP_SETTINGS_CHANGED, mothershipId, nbt));
diff --git a/src/main/resources/assets/amunra/lang/de_DE.lang b/src/main/resources/assets/amunra/lang/de_DE.lang
index e2444cbb..d353cbf9 100755
--- a/src/main/resources/assets/amunra/lang/de_DE.lang
+++ b/src/main/resources/assets/amunra/lang/de_DE.lang
@@ -46,6 +46,10 @@ tile.mothershipSettings.name=Mutterschiff-Konfigurationsterminal
 tile.mothershipSettings.description=Erlaubt es, Anpassungen am Mutterschiff vorzunehmen
 tile.mothershipSettings.customize=Anpassen
 tile.mothershipSettings.permission=Berechtigungen
+tile.mothershipSettings.permissionLand=Landungsberechtigungen
+tile.mothershipSettings.permissionLandDesc=Legt fest, wer auf diesem Mutterschiff landen kann
+tile.mothershipSettings.permissionUse=Nutzungsberechtigungen
+tile.mothershipSettings.permissionUseDesc=Legt fest, wer diverse Blöcke auf diesem Mutterschiff nutzen kann. Das betrifft die Navigationskonsole, die Triebwerke, und das Konfigurationsterminal selbst.
 tile.mothershipSettings.permission.addUserError=Nutzer %s nicht gefunden
 tile.mothershipSettings.permission.addUserErrorSelf=Du kannst dich nicht selbst hinzufügen
 tile.mothershipSettings.permission.addUser=Nutzer Hinzufügen
diff --git a/src/main/resources/assets/amunra/lang/en_US.lang b/src/main/resources/assets/amunra/lang/en_US.lang
index 4081d12e..23e54c22 100755
--- a/src/main/resources/assets/amunra/lang/en_US.lang
+++ b/src/main/resources/assets/amunra/lang/en_US.lang
@@ -46,6 +46,10 @@ tile.mothershipSettings.name=Mothership Configuration Terminal
 tile.mothershipSettings.description=Allows to customize Mothership's look on map, it's name and who is allowed to land on it.
 tile.mothershipSettings.customize=Customize
 tile.mothershipSettings.permission=Permissions
+tile.mothershipSettings.permissionLand=Landing Permissions
+tile.mothershipSettings.permissionLandDesc=Configures who is allowed to land on this mothership.
+tile.mothershipSettings.permissionUse=Usage Permissions
+tile.mothershipSettings.permissionUseDesc=Configures who is allowed to access and use several blocks on this mothership. This includes the control terminal, the engines, and this configuration terminal itself.
 tile.mothershipSettings.permission.addUserError=User %s not found
 tile.mothershipSettings.permission.addUserErrorSelf=You cannot add yourself
 tile.mothershipSettings.permission.addUser=Add User
diff --git a/src/main/resources/assets/amunra/lang/pl_PL.lang b/src/main/resources/assets/amunra/lang/pl_PL.lang
index 417d1574..6fb80df7 100755
--- a/src/main/resources/assets/amunra/lang/pl_PL.lang
+++ b/src/main/resources/assets/amunra/lang/pl_PL.lang
@@ -44,15 +44,19 @@ tile.mothershipEngineRocketBooster.name=Podstawa Silnika Rakietowego
 tile.mothershipEngineRocket.description=Umiesc Jeden lub wiecej blok�w bazowych silnika rakietowego w rzedzie, i jeden ster strumieniowy silnika rakietowego na jednej Stronie, aby utworzyc Statkek Kosmiczny
 tile.mothershipSettings.name=Terminal Konfiguracyjny Statka Kosmicznego
 tile.mothershipSettings.description=Pozwala na dostosowanie Statka Kosmicznego
-tile.mothershipSettings.customize=Anpassen
-tile.mothershipSettings.permission=Berechtigungen
-tile.mothershipSettings.permission.addUserError=Nutzer %s nicht gefunden
-tile.mothershipSettings.permission.addUserErrorSelf=Du kannst dich nicht selbst hinzuf�gen
-tile.mothershipSettings.permission.addUser=Nutzer Hinzuf�gen
-tile.mothershipSettings.permission.removeUser=Nutzer Entfernen
-tile.mothershipSettings.permission.allowLabel=Erlaubte Nutzer
-tile.mothershipSettings.permission.allowAll=Alle
-tile.mothershipSettings.permission.allowNone=Nur Besitzer
+tile.mothershipSettings.customize=Customize
+tile.mothershipSettings.permission=Permissions
+tile.mothershipSettings.permissionLand=Landing Permissions
+tile.mothershipSettings.permissionLandDesc=Configures who is allowed to land on this mothership.
+tile.mothershipSettings.permissionUse=Usage Permissions
+tile.mothershipSettings.permissionUseDesc=Configures who is allowed to access and use several blocks on this mothership. This includes the control terminal, the engines, and this configuration terminal itself.
+tile.mothershipSettings.permission.addUserError=User %s not found
+tile.mothershipSettings.permission.addUserErrorSelf=You cannot add yourself
+tile.mothershipSettings.permission.addUser=Add User
+tile.mothershipSettings.permission.removeUser=Remove User
+tile.mothershipSettings.permission.allowLabel=Allowed users
+tile.mothershipSettings.permission.allowAll=Everyone
+tile.mothershipSettings.permission.allowNone=Owner only
 tile.mothershipSettings.permission.whitelist=Whitelist
 tile.mothershipSettings.permission.blacklist=Blacklist
 tile.msBaseBlock.name=Podstawa Bloku Statka Kosmicznego
diff --git a/src/main/resources/assets/amunra/lang/ru_RU.lang b/src/main/resources/assets/amunra/lang/ru_RU.lang
index 5a0b692f..d4d6d313 100755
--- a/src/main/resources/assets/amunra/lang/ru_RU.lang
+++ b/src/main/resources/assets/amunra/lang/ru_RU.lang
@@ -46,6 +46,10 @@ tile.mothershipSettings.name=Панель конфигурации космич
 tile.mothershipSettings.description=Позволяет изменять настройки космического корабля
 tile.mothershipSettings.customize=Настройки
 tile.mothershipSettings.permission=Разрешения
+tile.mothershipSettings.permissionLand=Разрешения посадки
+tile.mothershipSettings.permissionLandDesc=Настройки, кто может приземляться на этом корабле.
+tile.mothershipSettings.permissionUse=Разрешения пользования
+tile.mothershipSettings.permissionUseDesc=Настройки, кто может использовать некоторые специальные блоки на этом корабле. Это включает навигационную панель, двигатели, и саму панель конфигурации.
 tile.mothershipSettings.permission.addUserError=Пользователь %s не найден
 tile.mothershipSettings.permission.addUserErrorSelf=Нельзя добавить себя
 tile.mothershipSettings.permission.addUser=Добавить
diff --git a/src/main/resources/assets/amunra/textures/blocks/controller.png b/src/main/resources/assets/amunra/textures/blocks/controller.png
index 8c60aa85c02cc07a37b03ab40f2cc463072ff14f..9ec3b8f3bc7d17dcfe354ebd5592122f41ec2fd6 100755
GIT binary patch
delta 1334
zcmV-61<CsDAL<{ltO^PL0RI60puMM)leG#Te+Ca14IYpuajF0S1ocToK~z}7y_Y|1
zTSXklKX>n(KW?2k{udY5ZlI-=s6@9SDwbA=DMD;vs2Dr2bm&B-W=N%U>d*m%7#NYV
zF<3%k03iWVCqR{|BGG>&X&lE+;<`9a{N6i;yZ2%{wwtujTi(0h-Ti*w``!2VyWfei
ze|Sa%Na@h4Icf;c-RUVeO(TR1*K4h5wVI$cDl$xKr-`E?00<!g@Z24=*7&}M0yvU?
z3(sreIFazHwU6(6##kS@);>xN1K|5ETI&v3&|G)BLl)>-S-gvq(!q7N*{m+3wMGbG
z6&fQ_Iz8n=NGlT|7$GFS@7i@LG^n+Yf7X77Y$A0O041bEsbRF%oH)J6WCqq7X3{T3
zJ3E>+-$u!N&t0-xvlCU+e1H9_ZN6vbpS=iA?isn?1R&|wahwQJIw*tMLkLOy=K_uz
zChgY9rY1?NRlar0yM_ZGfuZi!4fO0qSo$5B4aiSHHJDh(_dTSeP?4b#>q^ZVf2naw
zl~o#yP}*$LaJPCZ-fuqymH;OTjYlvNwZs(&Aq)uvVtx63jnOkF*?PQc7Rr<G_42Ob
zp!GA{J+7i4N1(9|rKa)1S~=tefNJeDky06g#D|RWXAu}1Wi&s^R-^Rd9&j7x+@lF-
zHDNLEfCvexgpej~AvBD;27ZgJe?Qg^w&Q-|$uVFIN@e2_>Y+^~gg~hwJg>z^-&Dw^
zCMj*2m~AvS_`Y57g-_X6`{9eue)Xx%UM3PeuZ6OSOu0781#w=gtQruNRi+AO;O!4~
z6%}WR-CP)GyMAQ`rsqs&<gf`r8-76xYzZMvA_|fSKsGhWgG!B+!Ua|$f5V+d&oA)V
zm6?G6ZnOcc|26}kylaj&a|iA{gA*V=&)ejrQNHgXr7{52I1ef{YRAuW{Qh@LefTkV
zFD+2NGQ+%8dNrCQcKufG-Cw)Ryajj_Lg4jz>lJ%6;;^(f1tOj}q9=2wSS#IUeQhzE
z7`uL}ui^TSfA$0rJAY~ye~2Yw0Hl8Hvf)s1mP9&FI(wYT>O+W)r}dks-_yxVK{Gw4
z0Uf)!paDG(nrOB|7R(_Sv*Yb!;oNA}=;&IX%oIYK(oqq6{-SSM4R<g-2gO-47R{n>
zZ=mm-3i}jiVS0}Gwado+{W2p0A*A5|_6iMdv3<pQ@IU$vM9)Fvf2RZG33GM(Na-N=
z9AppF;f{*4<{a&g#fjU9BR6(EV9z-8SieiE-50U(w4ThJq*{K&MrAp4bD*S~O#32X
z5Aufjp*YJ#Dn~Li#b$LGk<1kISUk(-`mzB49g)zF)%}uC&!}mO08@<Qh$nK?Yh^?-
zb4({Q$Ed76Wc{Dkf3B;7Y}S?i4wQ)6vtmGAAaN){YVvi;D}Nyp>Aapu9c8onglhTm
z-ZKjnyhtkUG8}LqnK?#0`5GIQC36JvWRA`1GS%|mgDaeN#e<r4bwBbYGX>(w92=D-
zQ;<mMgvI8-`@NsygZ2?&m8`a#|2#ijUbY_C6WSWr-QF!qf3?;xx1$60^`X4Yggy#1
zp4<9=cic4|)PrD)Qd1er=X2n{>RaB~s#xH8Ed$^caljatM21FCj-x_iBo0MPxpcTN
z_-Pi+4St$MbI*O6d0wmYX*Q9{zw*avSe9>8mmr7)Q!QeyX}yOZTa6k*n7TeTo~F6=
slzMF~1S*6uAnUttJs~<k1W)&W0V*E^OMl!j82|tP07*qoM6N<$f<483xBvhE

delta 1337
zcmV-91;+a7AMGEotO^Nb0B-<qHW#y&leG#Te*pvlGb{TUKo9@`1o%lrK~z}7y_Y>~
z990m<f3v%1-=4kakGsTnq?k+W!~%(=KnfyVQXmQo(U~Hmq@YQWib!$cNKTa^LPCgw
z63HEfB_s+E5+J2OfFhzqki-!LpX2lA#dl}l-VVjv-TUy}VJ9N5dHdeX&di(n&%Ak(
ze@Y)y0LyY{H^lBmYrAdt0YntA;{R0@-!CDmSWc2!wT$KTgnwCvr?!i#5(GXDz|hzm
z1i>Db)f3OEHB@Wnw+{QNHEi1rzpJQf(_S=cwQ|#5Bx_^&XB^9NsMX4pHkVLUL?mSL
zi9FM8U&Ka4P?bn5V4+$K>4^pt0#s{Fe|!DICjoG<ENt6FReAOG2aFtr^^#%waWUjh
zjheZXH}m-q&FqJaPRh(becr%dG5qH)!9VvxJ1PKpySrFc50>TNh}Z<`0~UinjAJ{!
z9Pzgp&5m%yS>Y@HX<cz-NTjHBv>JNu68!xuR7!9>2Wt`IE`j=poxrgZE`lJUf1Jz?
zkT0xIB1wL;Ldh?;7ktolY}hc^DJU&LGKGkSIt3?+Q4siic5w^$>}kr6S3=O9hA*Df
z1xKTk;#Rto0xJonb;wtY7gnD(U<RC8wTwu@0AvuO{8<9hF79!caw-4(9`H*h?x|s@
zR^Tt=0ab|s>41eFfhkmszY0N>fAVjuhdXg6dL|8|A^+5Pgxy%DBO=&#FF~-!dtVyx
z<u^@{DOEQ3rcv<4k2uiy_S5F|+P0Z(lL<kvhaDC&rxsSZD9`hS6=OtUh1~dAIP-R0
z(BdrK&4sSIi&th~dd@78{U!y&^oy&gNL(2mQ$hnoYyd{HBRni@u{?f}f8|7Pv(gI-
ze0*i5s{uC}3@rXK10TF)LVNTM+<OL-AfHTx#Yu63zz+dofiu9v!WLT-7npePHMw`+
z=kA9K6tB!M9}2yi8pXSQtNrP(U1mNs@G8WH7w1E-M4@r55cq=h502}=$XT`vcPXwt
zh#9@>w>l~=es{mE0p5kFf4U(d5F<m1*Df0jEzaU)CP-&rW4mw<TyIQ|oqk8t*-2%3
zP6739E-0Y$prl5d_97l4T1aoC#k{FeBctX2bapb<X_>3iYPeMPm(}<L({r#mYiOxa
z^!5gNXDVK^I1AHr6t7)2?(a|;jV{YzKvY9OR1co((YO01q|QU>fBQq#38TvZ-`W?*
zHde<cTAVd;3{NbRw~?_Mbq_=_jy%@sl4?vz*BjHp(K8g+?(=MYDRy%tq!mmD0%05Q
z#`R%wmj2-!US^7&jYmj2JE^XBoSm&l#sFx_gifgLRD{}QO+yBlW+X@7zzNF5Cy19h
zrC#O~#kKns%R6;fe?`@-rTQJJ5H(iC2)uyj_Tgow*joJ^@iG(IH*|uXjmH$%{@5S0
zNWk-y;uggb2E5EE`i5SqhafeWqqMoicHz(N9ZsX*ZX<McC-9}SlcWZ7>})(T4T)tr
zakJU=e(xmskZV<myJV-jTm0{IdC`8Lg)XAhYGp)h(~zj@e+!-H&>nCn!rM2%5m5qv
z?|(gUE4}`(37b+o;l};I%kV(s!^Tk+f?&_|11|{!mgSiE_oQ%aI}roJbNfuYl$z}R
zG)v~XKh2W4u1_;n!b3Ma&H9EWUi#xS?22ukZ9YVzOaN2_QAJhv;bX6|Zdxfx;Cf?J
v{SC^+<=9XWBSA&>-+CfVMp#Y~f3L*9{#gPvE%&QC00000NkvXXu0mjfj?slS

diff --git a/src/main/resources/assets/amunra/textures/gui/landing-permission.png b/src/main/resources/assets/amunra/textures/gui/landing-permission.png
new file mode 100755
index 0000000000000000000000000000000000000000..91ef705cd45f787594e46091131f281ad9c77cea
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4#EHc4#EKyC`y0;000McNliru;RX*E6$SxNaistN0sl!v
zK~z}7?N&W&8$l3#a~x^>1MJR>O%nG)zd)Ts(zpr4kiv}{7Y0KxAsFHm2@%L(90ZB+
z2mTxP2OI)!5<v=0rCuPbvE-c;@@`Jj-AQ-369n{Ni=AU{-kX`-8DNh80Q#^BftSLu
z0#M)gALU7a5}ao_mkR;?NAjuQ&!UK!*@+Snny6y`;DdSuwA<|=`}+DbbUL?qx$&IR
zIG3jU-LLQviBu7|>-VNs>J&ExxD4$p0uER$iBtr7y?(ONr&4SUnErk2HxVI5L<AuD
z5$LOdPhKL4vB<2jN+nbS!Eg=4{_XJK?U?P=#*5S;77^lrVb@f*z^Lk%ujgp|`Z;7@
zTw27tH+vwW+#aIX2pE`|G#W2Tef`^cEVIK;Rj8^KLcls7L?9k{l88-#t@e|nDo&27
zvrB<RtJMMkbd92G24bH)UMsdB2GxJ&Lc7eX+BK?Oqq@wi&i?-6XN^k%Gpk*xCm$2~
zX{l7!QmO0+*!@l8_W}T013Kzl0k@_h;a<Y+on3ej_xtqX${k$r23P*{;tBxp<NEp*
z01**w@9b**xaOQUMZ$dt6%hnc4Qf(1+<Lu9A!0geOM|jVRGzYR!z}pDoY*sHWDFZq
zX(LcSt|g6cWYbUyDGrz;8&p&cWPRIdR9TQPeq|XfwWw)$jyWv;07}&TUo7`m)Bpeg
M07*qoM6N<$f*uAEHvj+t

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/amunra/textures/gui/usage-permission.png b/src/main/resources/assets/amunra/textures/gui/usage-permission.png
new file mode 100755
index 0000000000000000000000000000000000000000..81c30e6620360a7b4fb3011438a8c23b98e3f6b5
GIT binary patch
literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4#EHc4#EKyC`y0;000McNliru;RX*E6f;ivgvS5?0@_JL
zK~z}7?Uvn76ImF>f9K3}+A=LI+JKY_90{5g6~o5etG#mnQvZ(S%53&x6Qfaa*AI@e
ztwj6+oOU{$&b)g;#3Gdzgm}|uG8gla^E~f!-j4$#j4;Ar$XPC~29ZzAT;@&V=`jC(
z6ULbRAgr}RuOst|w`BhEFH)Udl9M`Nj1hXSUNJ{SC9?}F6vitcLKHP=ho5M?e0Zc2
zUoQ?|*Dc)Xd2tuas@ZqK?MFT{e}inkfKrN7QnEQ8$H`EgyT<ERkEEXnV~p4<_Sg=&
zhsfuy;}<5#`z4a3izHnXknwW(g$brFUS;#YwL>DTwaU=P0qoF8D3uGBD3&S|$0u>U
z9C0V48%HRm_uNPm!sa$%81Sb4&rpeJj1hbLi-=zP4+#LMnPrNlN%CXkfDlD35KvkZ
zg#lq}hq`?*Y!wZxf&&6-W|_Kuz|8!0{Ng#r{4(9R0}9e4A=rJ##*2I8r>_!ju6<W&
zeunOSD3&L=xUfRw<wJJ2w`c|*Nz;T*)Y>Qa&d(9%)TuS114-yQ9;JyX)WQlIFYckW
zgO|+{w_7we9+N3mi3<fX<udUp3D5_7uHa>Tisebn;;+1Z^@!G|?LG3ba}>)Js+B60
zc6@3M=z~QlB;6QEQ}V?U)3Zx#Z9b!BF5pkq@D~<|5Sl@7Hd~M+T~G><6iEfw^#E`x
zQ+RS7<%S?BtuQ<r0dc2=)_WZgz;X6IkG~VbGSJP@`A|m%A5LxX^lpKAzV;_^9HF&~
zRvM)p0Cv3`8RZaIOSsh_Ztw7|cD!yapYMLNVVH3&Ki&KttzE+A4(tE^g=c;yZa2y7
zzNOQAe<b-=bB9%94iWS^({C85C-?u5#iid!B>|vQe@Zsv616@ayZPL*w%<O<QPU7W
zJ$rmtYGxULT-Ku<ygyOr`+I-`15ZT9I6YyEk=s2HuNpHj5r>ILjuZJwk6$B<@Wb#w
X?)XHxZnx^n00000NkvXXu0mjf{se%W

literal 0
HcmV?d00001


From 07a55a373f7461e09a3d3920d70abc14db9bdf4b Mon Sep 17 00:00:00 2001
From: katzenpapst <praecipitator@gmx.net>
Date: Fri, 23 Jun 2017 22:27:53 +0200
Subject: [PATCH 6/6] version

---
 build.gradle                                    | 2 +-
 changelog.txt                                   | 7 +++++++
 src/main/java/de/katzenpapst/amunra/AmunRa.java | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4fe22ce4..3d7c8a95 100755
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ apply plugin: 'forge'
 
 
 
-version = "0.4.7"
+version = "0.4.8"
 group = "de.katzenpapst.amunra" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "AmunRa-GC"
 def gc_version = "3.0.12.498"
diff --git a/changelog.txt b/changelog.txt
index 9f45bcd6..fcd21f84 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+=== 0.4.8 ===
+- shuttle saves dock position
+- improved shuttle dismounting
+- potentially fixed a crash with servers like Thermos or KCauldron
+- made the mehen belt slightly brighter
+- permissions for mothership landing and control are now separate
+
 === 0.4.7 ===
 - minimal GC version is build 498
 - made the Artificial Gravity Generator work using the new events
diff --git a/src/main/java/de/katzenpapst/amunra/AmunRa.java b/src/main/java/de/katzenpapst/amunra/AmunRa.java
index c929c52e..2610658e 100755
--- a/src/main/java/de/katzenpapst/amunra/AmunRa.java
+++ b/src/main/java/de/katzenpapst/amunra/AmunRa.java
@@ -102,7 +102,7 @@ public class AmunRa
 {
     public static final String MODID = "GalacticraftAmunRa";
     public static final String MODNAME = "Amun-Ra";
-    public static final String VERSION = "0.4.7";
+    public static final String VERSION = "0.4.8";
 
     public static ARChannelHandler packetPipeline;