Release prep

wilkemeyer · Aug 11, 2014 · f45c71f · f45c71f
1 parent 41ad66b
commit f45c71f
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,4 +52,15 @@ ops.txt
 server.properties
 servers.dat
 white-list.txt
-/world/
+/world/
+banned-ips.json
+banned-ips.txt.converted
+banned-players.json
+banned-players.txt.converted
+eula.txt
+ops.txt.converted
+ops.json
+usercache.json
+white-list.txt.converted
+whitelist.json
+world-20140811-075700.zip
diff --git a/build.gradle b/build.gradle
@@ -175,7 +175,7 @@ task mechanicalJar(type: Jar, dependsOn: reobf) {
         project.ext.baseExcludes.addAll(includes)
     }
     version = project.ext.jarVer
-    appendix = 'Mechanical'
+    appendix = 'Mechanical_beta'
 }
 
 task worldJar(type: Jar, dependsOn: reobf) {

diff --git a/build.properties b/build.properties
@@ -1,4 +1,4 @@
-mod.version=4.4.5
+mod.version=4.4.6
 
 mc.version=1.7.10
 forge.version=10.13.0.1180
@@ -7,4 +7,4 @@ ccl.version=1.1.1.93
 ccc.version=1.0.1.8
 fmp.version=1.1.0.296
 
-nei.version=1.0.2.15
+nei.version=1.0.2.15
diff --git a/resources/Changelog b/resources/Changelog
@@ -1,3 +1,12 @@
+v4.4.6
+- ADDED: Bus Converter gate
+- ADDED: Router controller and Routing CPU
+- CHANGE: Routing networks require a controller and CPU
+- FIX: Furnace recipe crash
+- FIX: Firewall item filter loading
+- FIX: Firewall item blocking request collection
+- FIX: Feedback light button crash
+
 v4.4.5
 - PORT: Minecraft 1.7.10
 

diff --git a/src/mrtjp/projectred/transportation/packethandlers.scala b/src/mrtjp/projectred/transportation/packethandlers.scala
@@ -1,15 +1,13 @@
 package mrtjp.projectred.transportation
 
-import codechicken.core.ClientUtils
 import codechicken.lib.packet.PacketCustom
-import codechicken.lib.packet.PacketCustom.{IServerPacketHandler, IClientPacketHandler}
-import mrtjp.projectred.ProjectRedTransportation
+import codechicken.lib.packet.PacketCustom.{IClientPacketHandler, IServerPacketHandler}
+import mrtjp.projectred.core.libmc.{ItemKey, ItemKeyStack, PRLib}
 import net.minecraft.client.Minecraft
-import net.minecraft.entity.player.{EntityPlayerMP, EntityPlayer}
-import net.minecraft.world.World
-import mrtjp.projectred.core.libmc.{PRLib, ItemKeyStack, ItemKey}
+import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.network.play.{INetHandlerPlayClient, INetHandlerPlayServer}
 import net.minecraft.util.ChatComponentText
+import net.minecraft.world.World
 
 class TransportationPH
 {
@@ -152,28 +150,42 @@ object TransportationSPH extends TransportationPH with IServerPacketHandler
         val t = PRLib.getMultiPart(sender.worldObj, bc, 6)
         if (t.isInstanceOf[IWorldRequester])
         {
-            import RequestFlags._
+            import mrtjp.projectred.transportation.RequestFlags._
             var opt = RequestFlags.ValueSet.newBuilder
             val pull = packet.readBoolean
             val craft = packet.readBoolean
             val partial = packet.readBoolean
             if (pull) opt += PULL
             if (craft) opt += CRAFT
             if (partial) opt += PARTIAL
-            val r = new RequestConsole(opt.result()).setDestination(t.asInstanceOf[IWorldRequester])
 
+            val router = t.asInstanceOf[IWorldRouter].getRouter
+            val r = new RequestConsole(opt.result()).setDestination(t.asInstanceOf[IWorldRequester])
             val s = ItemKeyStack.get(packet.readItemStack(true))
-            r.makeRequest(s)
-            if (r.requested > 0)
+
+            r.buildRequestTree(s)
+
+            if (!router.getController.usePower(r.getRequiredPower))
             {
-                sender.addChatMessage(new ChatComponentText("Successfully requested "+r.requested+" of "+s.key.getName+"."))
-                RouteFX.spawnType1(RouteFX.color_request, 8, bc, sender.worldObj)
+                sender.addChatMessage(new ChatComponentText("Could not request "+s.stackSize+" of "+s.key.getName+"."))
+                sender.addChatMessage(new ChatComponentText("Sufficient power not available."))
             }
             else
             {
-                sender.addChatMessage(new ChatComponentText("Could not request "+s.stackSize+" of "+s.key.getName+". Missing:"))
-                for ((k,v) <- r.getMissing) sender.addChatMessage(new ChatComponentText(v+" of "+k.getName))
+                r.startRequest()
+
+                if (r.requested > 0)
+                {
+                    sender.addChatMessage(new ChatComponentText("Successfully requested "+r.requested+" of "+s.key.getName+"."))
+                    RouteFX.spawnType1(RouteFX.color_request, 8, bc, sender.worldObj)
+                }
+                else
+                {
+                    sender.addChatMessage(new ChatComponentText("Could not request "+s.stackSize+" of "+s.key.getName+". Missing:"))
+                    for ((k,v) <- r.getMissing) sender.addChatMessage(new ChatComponentText(v+" of "+k.getName))
+                }
             }
+
             sendRequestList(t.asInstanceOf[IWorldRequester], sender, pull, craft)
         }
     }

diff --git a/src/mrtjp/projectred/transportation/requests.scala b/src/mrtjp/projectred/transportation/requests.scala
@@ -31,7 +31,7 @@ class RequestBranchNode(parentCrafter:CraftingPromise, thePackage:ItemKeyStack,
         else this.asInstanceOf[RequestRoot]
     }
 
-    private var subRequests = Vector[RequestBranchNode]()
+    var subRequests = Vector[RequestBranchNode]()
 
     private var promises = Vector[DeliveryPromise]()
     private var excessPromises = Vector[DeliveryPromise]()
@@ -602,12 +602,24 @@ class RequestConsole(opt:RequestFlags.ValueSet)
 
     def makeRequest(request:ItemKeyStack):RequestConsole =
     {
-        if (destination == null) return this
+        buildRequestTree(request)
+        startRequest()
+    }
+
+    def buildRequestTree(request:ItemKeyStack):RequestConsole =
+    {
+        assert(destination != null)
         parityBuilt = false
         used = null
         missing = null
         requested = 0
         branch = new RequestRoot(request.copy, destination, opt)
+
+        this
+    }
+
+    def startRequest():RequestConsole =
+    {
         if (branch.isDone || opt.contains(RequestFlags.PARTIAL) && branch.getPromisedCount > 0)
         {
             requested = branch.getPromisedCount
@@ -656,4 +668,12 @@ class RequestConsole(opt:RequestFlags.ValueSet)
         if (missing == null) gatherMissing()
         missing
     }
+
+    def getRequiredPower =
+    {
+        def count(p:RequestBranchNode):Int =
+            p.subRequests.foldLeft(1)((c, r) => c+count(r))
+
+        count(branch)*10.0D
+    }
 }