Updated SGT2 API.

src/api/java/lordfokas/stargatetech2/api/IFactory.java

@@ -1,8 +1,8 @@
-package stargatetech2.api;
+package lordfokas.stargatetech2.api;
 
-import stargatetech2.api.bus.IBusDevice;
-import stargatetech2.api.bus.IBusDriver;
-import stargatetech2.api.bus.IBusInterface;
+import lordfokas.stargatetech2.api.bus.IBusDevice;
+import lordfokas.stargatetech2.api.bus.IBusDriver;
+import lordfokas.stargatetech2.api.bus.IBusInterface;
 
 /**
  * A factory for private classes that implement

src/api/java/lordfokas/stargatetech2/api/IStackManager.java

@@ -1,4 +1,4 @@
-package stargatetech2.api;
+package lordfokas.stargatetech2.api;
 
 import java.util.Collection;
 

src/api/java/lordfokas/stargatetech2/api/IStargateTechAPI.java

@@ -1,9 +1,9 @@
-package stargatetech2.api;
+package lordfokas.stargatetech2.api;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraftforge.fluids.Fluid;
-import stargatetech2.api.stargate.IStargateNetwork;
-import stargatetech2.api.stargate.IStargatePlacer;
+import lordfokas.stargatetech2.api.stargate.IStargateNetwork;
+import lordfokas.stargatetech2.api.stargate.IStargatePlacer;
 
 public interface IStargateTechAPI {
 	/**
@@ -30,9 +30,4 @@ public interface IStargateTechAPI {
 	 * @return The current IFactory instance.
 	 */
 	public IFactory getFactory();
-	
-	/**
-	 * @return The current IStackManager instance.
-	 */
-	public IStackManager getStackManager();
 }

src/api/java/lordfokas/stargatetech2/api/ITabletAccess.java

@@ -1,4 +1,4 @@
-package stargatetech2.api;
+package lordfokas.stargatetech2.api;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;

src/api/java/lordfokas/stargatetech2/api/StargateTechAPI.java

@@ -1,4 +1,4 @@
-package stargatetech2.api;
+package lordfokas.stargatetech2.api;
 
 public abstract class StargateTechAPI implements IStargateTechAPI {
 	protected static IStargateTechAPI apiInstance;

src/api/java/lordfokas/stargatetech2/api/bus/BusEvent.java

@@ -1,7 +1,7 @@
-package stargatetech2.api.bus;
+package lordfokas.stargatetech2.api.bus;
 
-import net.minecraft.world.World;
 import cpw.mods.fml.common.eventhandler.Event;
+import net.minecraft.world.World;
 
 public class BusEvent extends Event{
 	public final World world;

src/api/java/lordfokas/stargatetech2/api/bus/BusPacket.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.bus;
+package lordfokas.stargatetech2.api.bus;
 
 import java.util.LinkedList;
 

src/api/java/lordfokas/stargatetech2/api/bus/BusPacketLIP.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.bus;
+package lordfokas.stargatetech2.api.bus;
 
 import java.util.ArrayList;
 import java.util.Hashtable;

src/api/java/lordfokas/stargatetech2/api/bus/BusPacketNetScan.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.bus;
+package lordfokas.stargatetech2.api.bus;
 
 import java.util.LinkedList;
 

src/api/java/lordfokas/stargatetech2/api/bus/BusProtocols.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.bus;
+package lordfokas.stargatetech2.api.bus;
 
 import java.util.ArrayList;
 

src/api/java/lordfokas/stargatetech2/api/bus/IBusDevice.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.bus;
+package lordfokas.stargatetech2.api.bus;
 
 import net.minecraft.world.World;
 

src/api/java/lordfokas/stargatetech2/api/bus/IBusDriver.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.bus;
+package lordfokas.stargatetech2.api.bus;
 
 /**
  * This provides a level of abstraction over the IBusInterface.

src/api/java/lordfokas/stargatetech2/api/bus/IBusInterface.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.bus;
+package lordfokas.stargatetech2.api.bus;
 
 import net.minecraft.nbt.NBTTagCompound;
 

src/api/java/lordfokas/stargatetech2/api/stargate/Address.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.stargate;
+package lordfokas.stargatetech2.api.stargate;
 
 public class Address {
 	private Symbol[] symbols;

src/api/java/lordfokas/stargatetech2/api/stargate/DialError.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.stargate;
+package lordfokas.stargatetech2.api.stargate;
 
 public enum DialError{
 	// Dialing Errors

src/api/java/lordfokas/stargatetech2/api/stargate/DialEvent.java

@@ -1,10 +1,8 @@
-package stargatetech2.api.stargate;
-
+package lordfokas.stargatetech2.api.stargate;
 
 import cpw.mods.fml.common.eventhandler.Cancelable;
-import cpw.mods.fml.common.eventhandler.Event;
 
-public abstract class DialEvent extends Event {
+public abstract class DialEvent extends StargateEvent {
 	public final Address sourceAddress;
 	public final Address destAddress;
 	public final int duration;

src/api/java/lordfokas/stargatetech2/api/stargate/IDynamicWorldLoader.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.stargate;
+package lordfokas.stargatetech2.api.stargate;
 
 
 public interface IDynamicWorldLoader {

src/api/java/lordfokas/stargatetech2/api/stargate/IStargateNetwork.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.stargate;
+package lordfokas.stargatetech2.api.stargate;
 
 import net.minecraft.world.World;
 

src/api/java/lordfokas/stargatetech2/api/stargate/IStargatePlacer.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.stargate;
+package lordfokas.stargatetech2.api.stargate;
 
 import net.minecraft.world.World;
 

src/api/java/lordfokas/stargatetech2/api/stargate/ITileStargate.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.stargate;
+package lordfokas.stargatetech2.api.stargate;
 
 /**
  * Represents a Stargate ring.

src/api/java/lordfokas/stargatetech2/api/stargate/ITileStargateBase.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.stargate;
+package lordfokas.stargatetech2.api.stargate;
 
 /**
  * Represents a Stargate base block (the block that supports the stargate).

src/api/java/lordfokas/stargatetech2/api/stargate/StargateEvent.java

@@ -0,0 +1,38 @@
+package lordfokas.stargatetech2.api.stargate;
+
+import cpw.mods.fml.common.eventhandler.Cancelable;
+import cpw.mods.fml.common.eventhandler.Event;
+import net.minecraft.world.World;
+
+public abstract class StargateEvent extends Event {
+
+	private static abstract class PhysicalGateEvent extends StargateEvent {
+		public final Address address;
+		public final World world;
+		public final int xCoord;
+		public final int yCoord;
+		public final int zCoord;
+		
+		public PhysicalGateEvent(Address addr, World world, int x, int y, int z) {
+			this.xCoord = x;
+			this.yCoord = y;
+			this.zCoord = z;
+			this.world = world;
+			this.address = addr;
+		}
+	}
+	
+	@Cancelable
+	public static class StargateWrenched extends PhysicalGateEvent {
+		public StargateWrenched(Address addr, World world, int x, int y, int z) {
+			super(addr, world, x, y, z);
+		}
+	}
+	
+	public static class StargateDestroyed extends PhysicalGateEvent {
+		public StargateDestroyed(Address addr, World world, int x, int y, int z) {
+			super(addr, world, x, y, z);
+		}
+	}
+	
+}

src/api/java/lordfokas/stargatetech2/api/stargate/Symbol.java

@@ -1,4 +1,4 @@
-package stargatetech2.api.stargate;
+package lordfokas.stargatetech2.api.stargate;
 
 public enum Symbol {
 	VOID(""),

src/api/java/lordfokas/stargatetech2/api/world/EventWorldGen.java

@@ -1,9 +1,10 @@
-package stargatetech2.api.world;
+package lordfokas.stargatetech2.api.world;
 
-import cpw.mods.fml.common.eventhandler.Event;
 import net.minecraft.world.World;
+import cpw.mods.fml.common.eventhandler.Event;
+import cpw.mods.fml.common.eventhandler.Event.HasResult;
 
-@Event.HasResult
+@HasResult
 public class EventWorldGen extends Event {
 
 	public final World world;

src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala

@@ -27,7 +27,7 @@ import net.minecraft.nbt.NBTTagString
 import net.minecraftforge.common.util.Constants.NBT
 import net.minecraftforge.common.util.ForgeDirection
 import net.minecraftforge.event.world.WorldEvent
-import stargatetech2.api.bus.IBusDevice
+import lordfokas.stargatetech2.api.bus.IBusDevice
 
 import scala.collection.mutable
 

src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala

@@ -10,9 +10,9 @@ import li.cil.oc.integration.util.StargateTech2
 import li.cil.oc.server.component
 import li.cil.oc.server.{PacketSender => ServerPacketSender}
 import net.minecraft.nbt.NBTTagCompound
-import stargatetech2.api.StargateTechAPI
-import stargatetech2.api.bus.IBusDevice
-import stargatetech2.api.bus.IBusInterface
+import lordfokas.stargatetech2.api.StargateTechAPI
+import lordfokas.stargatetech2.api.bus.IBusDevice
+import lordfokas.stargatetech2.api.bus.IBusInterface
 
 // IMPORTANT: for some reason that is beyond me we cannot implement the
 // IBusDevice here directly, since we'll get an error if the interface is not

src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala

@@ -26,7 +26,7 @@ import net.minecraft.nbt.NBTTagCompound
 import net.minecraft.nbt.NBTTagString
 import net.minecraftforge.common.util.Constants.NBT
 import net.minecraftforge.common.util.ForgeDirection
-import stargatetech2.api.bus.IBusDevice
+import lordfokas.stargatetech2.api.bus.IBusDevice
 
 import scala.collection.mutable
 

src/main/scala/li/cil/oc/integration/stargatetech2/ConverterBusPacketNetScanDevice.scala

@@ -3,7 +3,7 @@ package li.cil.oc.integration.stargatetech2
 import java.util
 
 import li.cil.oc.api
-import stargatetech2.api.bus.BusPacketNetScan
+import lordfokas.stargatetech2.api.bus.BusPacketNetScan
 
 import scala.collection.convert.WrapAsScala._
 

src/main/scala/li/cil/oc/integration/stargatetech2/DriverAbstractBusCard.scala

@@ -9,7 +9,7 @@ import li.cil.oc.integration.Mods
 import li.cil.oc.integration.opencomputers.Item
 import li.cil.oc.server.component
 import net.minecraft.item.ItemStack
-import stargatetech2.api.bus.IBusDevice
+import lordfokas.stargatetech2.api.bus.IBusDevice
 
 object DriverAbstractBusCard extends Item with HostAware with EnvironmentAware {
   override def worksWith(stack: ItemStack) =

src/main/scala/li/cil/oc/integration/util/StargateTech2.scala

@@ -2,8 +2,8 @@ package li.cil.oc.integration.util
 
 import net.minecraft.world.World
 import net.minecraftforge.common.MinecraftForge
-import stargatetech2.api.bus.BusEvent.AddToNetwork
-import stargatetech2.api.bus.BusEvent.RemoveFromNetwork
+import lordfokas.stargatetech2.api.bus.BusEvent.AddToNetwork
+import lordfokas.stargatetech2.api.bus.BusEvent.RemoveFromNetwork
 
 object StargateTech2 {
   def addDevice(world: World, x: Int, y: Int, z: Int) = MinecraftForge.EVENT_BUS.post(new AddToNetwork(world, x, y, z))

src/main/scala/li/cil/oc/server/component/AbstractBusCard.scala

@@ -8,8 +8,8 @@ import li.cil.oc.api.machine.Context
 import li.cil.oc.api.network._
 import li.cil.oc.api.prefab
 import net.minecraft.nbt.NBTTagCompound
-import stargatetech2.api.StargateTechAPI
-import stargatetech2.api.bus._
+import lordfokas.stargatetech2.api.StargateTechAPI
+import lordfokas.stargatetech2.api.bus._
 
 import scala.collection.convert.WrapAsScala._