diff --git a/src/api/java/lordfokas/stargatetech2/api/IFactory.java b/src/api/java/lordfokas/stargatetech2/api/IFactory.java index 0a9b43492..f74141f74 100644 --- a/src/api/java/lordfokas/stargatetech2/api/IFactory.java +++ b/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 diff --git a/src/api/java/lordfokas/stargatetech2/api/IStackManager.java b/src/api/java/lordfokas/stargatetech2/api/IStackManager.java index a1493c727..4487931e5 100644 --- a/src/api/java/lordfokas/stargatetech2/api/IStackManager.java +++ b/src/api/java/lordfokas/stargatetech2/api/IStackManager.java @@ -1,4 +1,4 @@ -package stargatetech2.api; +package lordfokas.stargatetech2.api; import java.util.Collection; diff --git a/src/api/java/lordfokas/stargatetech2/api/IStargateTechAPI.java b/src/api/java/lordfokas/stargatetech2/api/IStargateTechAPI.java index 1906dc4c1..8a98fe811 100644 --- a/src/api/java/lordfokas/stargatetech2/api/IStargateTechAPI.java +++ b/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(); } \ No newline at end of file diff --git a/src/api/java/lordfokas/stargatetech2/api/ITabletAccess.java b/src/api/java/lordfokas/stargatetech2/api/ITabletAccess.java index d9ffb5edb..9d242e37f 100644 --- a/src/api/java/lordfokas/stargatetech2/api/ITabletAccess.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/StargateTechAPI.java b/src/api/java/lordfokas/stargatetech2/api/StargateTechAPI.java index c3096a6e5..67438eb23 100644 --- a/src/api/java/lordfokas/stargatetech2/api/StargateTechAPI.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/bus/BusEvent.java b/src/api/java/lordfokas/stargatetech2/api/bus/BusEvent.java index 0851f2556..4073fa43e 100644 --- a/src/api/java/lordfokas/stargatetech2/api/bus/BusEvent.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/bus/BusPacket.java b/src/api/java/lordfokas/stargatetech2/api/bus/BusPacket.java index 351d25ba9..cc27ec118 100644 --- a/src/api/java/lordfokas/stargatetech2/api/bus/BusPacket.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/bus/BusPacketLIP.java b/src/api/java/lordfokas/stargatetech2/api/bus/BusPacketLIP.java index dcc873f0f..9f7eac318 100644 --- a/src/api/java/lordfokas/stargatetech2/api/bus/BusPacketLIP.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/bus/BusPacketNetScan.java b/src/api/java/lordfokas/stargatetech2/api/bus/BusPacketNetScan.java index e4706bb98..c48377f7b 100644 --- a/src/api/java/lordfokas/stargatetech2/api/bus/BusPacketNetScan.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/bus/BusProtocols.java b/src/api/java/lordfokas/stargatetech2/api/bus/BusProtocols.java index fc81dd5fb..83385275e 100644 --- a/src/api/java/lordfokas/stargatetech2/api/bus/BusProtocols.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/bus/IBusDevice.java b/src/api/java/lordfokas/stargatetech2/api/bus/IBusDevice.java index becf8b4d7..b833cb664 100644 --- a/src/api/java/lordfokas/stargatetech2/api/bus/IBusDevice.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/bus/IBusDriver.java b/src/api/java/lordfokas/stargatetech2/api/bus/IBusDriver.java index 624366820..a255af00e 100644 --- a/src/api/java/lordfokas/stargatetech2/api/bus/IBusDriver.java +++ b/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. diff --git a/src/api/java/lordfokas/stargatetech2/api/bus/IBusInterface.java b/src/api/java/lordfokas/stargatetech2/api/bus/IBusInterface.java index 39a1dfe87..848b0f7f9 100644 --- a/src/api/java/lordfokas/stargatetech2/api/bus/IBusInterface.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/Address.java b/src/api/java/lordfokas/stargatetech2/api/stargate/Address.java index 5f7caa404..71420ea69 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/Address.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/DialError.java b/src/api/java/lordfokas/stargatetech2/api/stargate/DialError.java index efb5b272d..422c61f7e 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/DialError.java +++ b/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 diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/DialEvent.java b/src/api/java/lordfokas/stargatetech2/api/stargate/DialEvent.java index 2012e7834..184256ae7 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/DialEvent.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/IDynamicWorldLoader.java b/src/api/java/lordfokas/stargatetech2/api/stargate/IDynamicWorldLoader.java index 88c9a26df..3da10b081 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/IDynamicWorldLoader.java +++ b/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 { diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/IStargateNetwork.java b/src/api/java/lordfokas/stargatetech2/api/stargate/IStargateNetwork.java index c66fe3a81..276a08254 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/IStargateNetwork.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/IStargatePlacer.java b/src/api/java/lordfokas/stargatetech2/api/stargate/IStargatePlacer.java index 348c12143..522c99fb2 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/IStargatePlacer.java +++ b/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; diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/ITileStargate.java b/src/api/java/lordfokas/stargatetech2/api/stargate/ITileStargate.java index b50d2d8ab..f481b061f 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/ITileStargate.java +++ b/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. diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/ITileStargateBase.java b/src/api/java/lordfokas/stargatetech2/api/stargate/ITileStargateBase.java index 1ff40cf4e..6b9ba82c3 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/ITileStargateBase.java +++ b/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). diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/StargateEvent.java b/src/api/java/lordfokas/stargatetech2/api/stargate/StargateEvent.java new file mode 100644 index 000000000..84f52c2ca --- /dev/null +++ b/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); + } + } + +} diff --git a/src/api/java/lordfokas/stargatetech2/api/stargate/Symbol.java b/src/api/java/lordfokas/stargatetech2/api/stargate/Symbol.java index dcad644a7..845ad8838 100644 --- a/src/api/java/lordfokas/stargatetech2/api/stargate/Symbol.java +++ b/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(""), diff --git a/src/api/java/lordfokas/stargatetech2/api/world/EventWorldGen.java b/src/api/java/lordfokas/stargatetech2/api/world/EventWorldGen.java index 8b1df90e1..2fcc7c0c0 100644 --- a/src/api/java/lordfokas/stargatetech2/api/world/EventWorldGen.java +++ b/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; diff --git a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala index 3ce4bf181..73f53fd1c 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala +++ b/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 diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala index 68f10d3da..984debef4 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala +++ b/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 diff --git a/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala b/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala index f446ab9bb..07fa43c51 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala +++ b/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 diff --git a/src/main/scala/li/cil/oc/integration/stargatetech2/ConverterBusPacketNetScanDevice.scala b/src/main/scala/li/cil/oc/integration/stargatetech2/ConverterBusPacketNetScanDevice.scala index 45170778e..072b55324 100644 --- a/src/main/scala/li/cil/oc/integration/stargatetech2/ConverterBusPacketNetScanDevice.scala +++ b/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._ diff --git a/src/main/scala/li/cil/oc/integration/stargatetech2/DriverAbstractBusCard.scala b/src/main/scala/li/cil/oc/integration/stargatetech2/DriverAbstractBusCard.scala index be1745c94..d242f2510 100644 --- a/src/main/scala/li/cil/oc/integration/stargatetech2/DriverAbstractBusCard.scala +++ b/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) = diff --git a/src/main/scala/li/cil/oc/integration/util/StargateTech2.scala b/src/main/scala/li/cil/oc/integration/util/StargateTech2.scala index 41317fc0f..6c1ebc43e 100644 --- a/src/main/scala/li/cil/oc/integration/util/StargateTech2.scala +++ b/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)) diff --git a/src/main/scala/li/cil/oc/server/component/AbstractBusCard.scala b/src/main/scala/li/cil/oc/server/component/AbstractBusCard.scala index e4fa3c51e..a9f2a2a05 100644 --- a/src/main/scala/li/cil/oc/server/component/AbstractBusCard.scala +++ b/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._