Merge remote-tracking branch 'lordIcocain/wirelesshub' into dev

src/main/resources/assets/ae2stuff/lang/en_US.lang

@@ -2,6 +2,7 @@ tile.ae2stuff.Encoder.name=Pattern Encoder
 tile.ae2stuff.Grower.name=Crystal Growth Chamber
 tile.ae2stuff.Inscriber.name=Advanced Inscriber
 tile.ae2stuff.Wireless.name=Wireless Connector
+tile.ae2stuff.WirelessHub.name=Wireless Hub
 
 item.ae2stuff.WirelessKit.name=Wireless Setup Kit
 item.ae2stuff.AdvWirelessKit.name=Advanced Wireless Setup Kit
@@ -33,6 +34,7 @@ ae2stuff.wireless.advtool.binding=§aBinding Mode
 ae2stuff.wireless.advtool.queueing.activated=Queuing mode activated
 ae2stuff.wireless.advtool.binding.activated=Binding mode activated
 ae2stuff.wireless.advtool.queued=Added connector at %s,%s,%s to queue
+ae2stuff.wireless.advtool.queuederror=Connector already in queue
 ae2stuff.wireless.advtool.queueing.empty=Click Wireless Connectors to add to binding queue
 ae2stuff.wireless.advtool.binding.empty=Switch to Queuing Mode to add connectors to queue
 ae2stuff.wireless.advtool.queueing.notempty=Current wireless connectors in queue:
@@ -41,11 +43,17 @@ ae2stuff.wireless.advtool.connector.next=Next connector in queue: %s,%s,%s
 ae2stuff.wireless.advtool.extra=§oSneak right click to change mode between queuing and binding mode
 ae2stuff.wireless.advtool.noconnectors=No connectors found in queue. Try putting the tool into queueing mode and adding some
 ae2stuff.wireless.advtool.pop=Removed %s,%s,%s from queue
+ae2stuff.wireless.advtool.hub.queued=%s hub slots added to queue
+ae2stuff.wireless.advtool.queueing.clear=Queue is cleared
+ae2stuff.wireless.tooltips.advtool.queueing.clear=Shift + Ctrl + R-click for clear queue
+ae2stuff.wireless.tooltips.advtool.hubqols.binding=Ctrl + R-click for connect to all free hub slots
+ae2stuff.wireless.tooltips.advtool.hubqols.queueing=Ctrl + R-click for add all free hub slots to queue
 ae2stuff.wireless.tool.connected=Connected to %s,%s,%s
 ae2stuff.wireless.tool.failed=Connection failed
 ae2stuff.wireless.tool.dimension=Both connectors must be in the same dimension
 ae2stuff.wireless.tool.noexist=Bound connector does not exist
 ae2stuff.wireless.tool.security.player=Security violation - you are not allowed to modify this network
+ae2stuff.wireless.tool.targethubfull=Target Hub is Full
 
 ae2stuff.visualiser.bound=Visualising network at %s,%s,%s
 ae2stuff.visualiser.mode=Mode:

src/main/scala/net/bdew/ae2stuff/Recipes.scala

@@ -4,7 +4,6 @@ import cpw.mods.fml.common.registry.GameRegistry
 import net.bdew.ae2stuff.items.{AdvWirelessKit, ItemWirelessKit}
 import net.bdew.ae2stuff.machines.wireless.BlockWireless
 import net.minecraft.item.ItemStack
-import net.minecraftforge.oredict.OreDictionary
 
 object Recipes {
   def load(): Unit = {
@@ -19,7 +18,131 @@ object Recipes {
     )
     GameRegistry.addShapelessRecipe(
       new ItemStack(BlockWireless),
-      new ItemStack(BlockWireless, 1, OreDictionary.WILDCARD_VALUE)
+      new ItemStack(BlockWireless, 1, 1)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 2)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 3)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 4)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 5)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 6)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 7)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 8)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 9)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 10)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 11)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 12)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 13)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 14)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 15)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless),
+      new ItemStack(BlockWireless, 1, 16)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 18)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 19)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 20)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 21)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 22)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 23)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 24)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 25)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 26)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 27)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 28)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 29)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 30)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 31)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 32)
+    )
+    GameRegistry.addShapelessRecipe(
+      new ItemStack(BlockWireless, 1, 17),
+      new ItemStack(BlockWireless, 1, 33)
     )
   }
 }