Block renaming

core/assets/bundles/bundle.properties

@@ -461,8 +461,6 @@ block.lancer.name=Lancer
 block.conveyor.name=Conveyor
 block.titanium-conveyor.name=Titanium Conveyor
 block.junction.name=Junction
-block.splitter.name=Router
-block.splitter.description=Outputs items into three different directions once they are recieved.
 block.router.name=Router
 block.router.description=Splits items into all 4 directions. Can store items as a buffer.
 block.distributor.name=Distributor

core/src/io/anuke/mindustry/content/Recipes.java

@@ -48,7 +48,7 @@ public class Recipes implements ContentList{
 
         //starter lead transporation
         new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.lead, 2));
-        new Recipe(distribution, DistributionBlocks.splitter, new ItemStack(Items.lead, 6));
+        new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.lead, 6));
 
         //advanced carbide transporation
         new Recipe(distribution, DistributionBlocks.distributor, new ItemStack(Items.carbide, 8), new ItemStack(Items.tungsten, 8));

core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java

@@ -6,7 +6,7 @@ import io.anuke.mindustry.world.blocks.distribution.*;
 
 public class DistributionBlocks extends BlockList implements ContentList{
     public static Block conveyor, titaniumconveyor, distributor, junction,
-            bridgeConveyor, phaseConveyor, sorter, splitter, overflowGate, massDriver;
+            bridgeConveyor, phaseConveyor, sorter, router, overflowGate, massDriver;
 
     @Override
     public void load(){
@@ -39,9 +39,9 @@ public class DistributionBlocks extends BlockList implements ContentList{
 
         sorter = new Sorter("sorter");
 
-        splitter = new Splitter("splitter");
+        router = new Router("router");
 
-        distributor = new Splitter("distributor"){{
+        distributor = new Router("distributor"){{
             size = 2;
         }};
 

core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java

@@ -6,7 +6,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.util.Mathf;
 
-public class OverflowGate extends Splitter{
+public class OverflowGate extends Router{
 
     public OverflowGate(String name){
         super(name);

core/src/io/anuke/mindustry/world/blocks/distribution/Router.java

@@ -10,10 +10,10 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
 import io.anuke.ucore.core.Timers;
 
-public class Splitter extends Block{
+public class Router extends Block{
     protected float speed = 8f;
 
-    public Splitter(String name){
+    public Router(String name){
         super(name);
         solid = true;
         update = true;
@@ -36,7 +36,7 @@ public class Splitter extends Block{
             entity.time += 1f/speed * Timers.delta();
             Tile target = getTileTarget(tile, entity.lastItem, entity.lastInput, false);
 
-            if(target != null && (entity.time >= 1f || !(target.block() instanceof Splitter))){
+            if(target != null && (entity.time >= 1f || !(target.block() instanceof Router))){
                 getTileTarget(tile, entity.lastItem, entity.lastInput, true);
                 target.block().handleItem(entity.lastItem, target, Edges.getFacingEdge(tile, target));
                 entity.items.remove(entity.lastItem, 1);