Feature/hydro multiblock

amunra_Client.launch

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/amunra"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="amunra"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DFORGE_FORCE_FRAME_RECALC=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="D:\Code\amunra\run"/>
+</launchConfiguration>

amunra_Server.launch

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/amunra"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="amunra"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DFORGE_FORCE_FRAME_RECALC=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="D:\Code\amunra\run"/>
+</launchConfiguration>

build.gradle

@@ -16,6 +16,10 @@ buildscript {
 }
 
 repositories {
+    ivy {
+        name "BuildCraft"
+        artifactPattern "http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
+    }
     maven {
         name = "chickenbones"
         url = "http://chickenbones.net/maven"
@@ -26,14 +30,13 @@ repositories {
     }
 }
 
-
 apply plugin: 'forge'
 
-
-
-version = "0.4.3"
-group= "de.katzenpapst.amunra" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+version = "0.4.9"
+group = "de.katzenpapst.amunra" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "AmunRa-GC"
+def gc_version = "3.0.12.502"
+def bc_version = "7.1.23"
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -73,14 +76,13 @@ dependencies {
     compile ("com.enderio:EnderIO:1.7.10-2.3.0.429_beta:dev" ) {
         transitive = false
     }
-    compile "com.mod-buildcraft:buildcraft:6.1.5:api"
-
-    compile files("libs/MicdoodleCore-Dev-1.7-3.0.12.476.jar")
-    compile files("libs/Galacticraft-API-1.7-3.0.12.476.jar")
-    compile files("libs/GalacticraftCore-Dev-1.7-3.0.12.476.jar")
-    compile files("libs/Galacticraft-Planets-Dev-1.7-3.0.12.476.jar")
-
+    compile name: 'buildcraft', version: "${bc_version}", classifier: "dev", ext: 'jar'
 
+    compile files("libs/MicdoodleCore-Dev-1.7-${gc_version}.jar")
+    compile files("libs/Galacticraft-API-1.7-${gc_version}.jar")
+    compile files("libs/GalacticraftCore-Dev-1.7-${gc_version}.jar")
+    compile files("libs/Galacticraft-Planets-Dev-1.7-${gc_version}.jar")
+
 }
 
 dependencies {

changelog.txt

@@ -1,3 +1,35 @@
+=== 0.4.8 ===
+- improved shuttle positioning and 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
+- made an animated texture for the AGG, added particles when it's on
+- made an animated texture for dark matter
+- the Artificial Gravity Disruptor now has to be enabled (rightclick), and will work from any point in the inventory
+
+=== 0.4.6 ===
+- allowed rockets to be started from motherships
+- fixed several issue with sky rendering (asteroid fields and rings should render properly now)
+- auto-set matchUsersByUUID to false on "offline" servers (Apparently Client and Server get some random UUIDs, which never match when offline)
+- tried updating the transit progress bar client-side
+- upgraded to GC 495
+- added a sanity check for mothershipProviderID, should prevent collisions
+
+=== 0.4.5 ===
+- improved the environmental boost of isotope generators, fixes #33
+- Upgraded to Galacticraft 1.7-3.0.12.488
+- Fixed a bug where mothership data sometimes wouldn't be send to clients
+- hopefully fixed the nullpointerexception in sky rendering
+
+=== 0.4.4 ===
+- adjusted permission levels of commands
+- added two craftable metal chests
+- potentially fixed a nullpointerexception with buildcraft facades
+
 == 0.4.3 ==
 - updated Galacticraft version to 476
 - added permission tab to settings gui: you can now allow everyone, no-one, everyone except blacklisted users, or only whitelisted users to enter the ship. The owner is always allowed.

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.3";
+    public static final String VERSION = "0.4.8";
 
     public static ARChannelHandler packetPipeline;
 
@@ -169,7 +169,7 @@ public void preInit(FMLPreInitializationEvent event)
         ARItems.initItems();
         // this works for entityLivingEvent...
         MinecraftForge.EVENT_BUS.register(new EventHandlerAR());
-        // ...but not for onCrafting. Because FUCK YOU, that's why!
+        // ...but not for onCrafting.
         FMLCommonHandler.instance().bus().register(new CraftingHandler());
         GameRegistry.registerFuelHandler(new FurnaceHandler());
 
@@ -271,8 +271,13 @@ public void postInit(FMLPostInitializationEvent event)
 
     private void doCompatibilityChecks()
     {
-        //
+        // sanity checks go here
+        // verify crafting
         RecipeHelper.verifyNasaWorkbenchCrafting();
+
+        // verify mothership provider ID
+        config.verifyMothershipProviderId();
+
     }
 
     // stolen from GC....

src/main/java/de/katzenpapst/amunra/block/BlockBasicMeta.java

@@ -228,6 +228,7 @@ public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List
     public boolean hasTileEntity(int meta)
     {
         SubBlock sb = getSubBlock(meta);
+        if(sb == null) return false;
         return sb.hasTileEntity(meta);
     }
 

src/main/java/de/katzenpapst/amunra/block/BlockMachineMeta.java

@@ -458,4 +458,12 @@ public boolean canReplace(World world, int x, int y, int z, int probablySide, It
         }
         return super.canReplace(world, x, y, z, probablySide, stack);
     }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void randomDisplayTick(World world, int x, int y, int z, Random rand)
+    {
+        int meta = world.getBlockMetadata(x, y, z);
+        this.getSubBlock(meta).randomDisplayTick(world, x, y, z, rand);
+    }
 }

src/main/java/de/katzenpapst/amunra/block/SubBlockDropItem.java

@@ -85,13 +85,13 @@ public int quantityDropped(Random rand)
     @Override
     public int damageDropped(int meta)
     {
-        return droppedItems.getDamage();
+        return droppedItems != null ? droppedItems.getDamage() : super.damageDropped(meta);
     }
 
     @Override
     public Item getItemDropped(int meta, Random random, int fortune)
     {
-        return droppedItems.getItem();
+        return droppedItems != null ? droppedItems.getItem() : super.getItemDropped(meta, random, fortune);
     }
 
     public SubBlockDropItem setDroppedItem(Item item) {

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;

src/main/java/de/katzenpapst/amunra/block/machine/BlockGravitation.java

@@ -1,13 +1,18 @@
 package de.katzenpapst.amunra.block.machine;
 
+import java.util.Random;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.GuiIds;
 import de.katzenpapst.amunra.block.BlockMachineMeta;
 import de.katzenpapst.amunra.block.SubBlockMachine;
 import de.katzenpapst.amunra.helper.CoordHelper;
+import de.katzenpapst.amunra.proxy.ARSidedProxy.ParticleType;
 import de.katzenpapst.amunra.tile.TileEntityGravitation;
+import micdoodle8.mods.galacticraft.api.vector.Vector3;
+import micdoodle8.mods.galacticraft.core.GalacticraftCore;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
@@ -59,28 +64,6 @@ public IIcon getIcon(int side, int meta)
             return this.backIcon;
         }
         return this.sideIcon;
-/*
-        ForgeDirection sideDirection = CoordHelper.rotateForgeDirection(ForgeDirection.getOrientation(side), realMeta);
-
-
-        switch(sideDirection) {
-        case DOWN:
-            return this.sideIcon;
-        case EAST:
-            return this.sideIcon;
-        case NORTH:
-            return this.backIcon;
-        case SOUTH:
-            return this.blockIcon;
-        case UP:
-            return this.sideIcon;
-        case WEST:
-            return this.sideIcon;
-        case UNKNOWN:
-        default:
-            return this.sideIcon;
-        }
-        */
     }
 
 
@@ -102,4 +85,48 @@ public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer
         return true;
     }
 
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void randomDisplayTick(World par1World, int x, int y, int z, Random rand)
+    {
+        boolean test = true;
+        if (par1World.getTileEntity(x, y, z) instanceof TileEntityGravitation)
+        {
+            TileEntityGravitation tile = (TileEntityGravitation)par1World.getTileEntity(x, y, z);
+            if(tile.isRunning()) {
+                for (int particleCount = 0; particleCount < 10; particleCount++)
+                {
+                    double x2 = x + rand.nextFloat();
+                    double y2 = y + rand.nextFloat();
+                    double z2 = z + rand.nextFloat();
+                    double mX = 0.0D;
+                    double mY = 0.0D;
+                    double mZ = 0.0D;
+                    int dir = rand.nextInt(2) * 2 - 1;
+                    mX = 0;//(rand.nextFloat() - 0.5D) * 0.5D;
+                    mY = (rand.nextFloat() - 0.5D) * 0.5D;
+                    mZ = 0;//(rand.nextFloat() - 0.5D) * 0.5D;
+
+                    final int var2 = par1World.getBlockMetadata(x, y, z);
+
+                    if (var2 == 3 || var2 == 2)
+                    {
+                        x2 = x + 0.5D + 0.25D * dir;
+                        mX = rand.nextFloat() * 2.0F * dir;
+                    }
+                    else
+                    {
+                        z2 = z + 0.5D + 0.25D * dir;
+                        mZ = rand.nextFloat() * 2.0F * dir;
+                    }
+
+                    if(test) {
+                        AmunRa.proxy.spawnParticles(ParticleType.PT_GRAVITY_DUST, par1World, new Vector3(x+0.5, y+0.5, z+0.5), new Vector3(mX, tile.getGravityForce(), mZ));
+                    } else {
+                        GalacticraftCore.proxy.spawnParticle("oxygen", new Vector3(x2, y2, z2), new Vector3(mX, mY, mZ), new Object[] { new Vector3(0.7D, 0.7D, 1.0D) });
+                    }
+                }
+            }
+        }
+    }
 }

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;

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