mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

Block renaming

Browse Source
This commit is contained in:
Anuken 2018-08-16 18:38:04 -04:00
parent 20d3740e75
commit 020c6388c2
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
core/assets-raw/sprites/blocks/distribution/splitter.png → core/assets-raw/sprites/blocks/distribution/router.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 226 B

BIN
core/assets-raw/sprites/blocks/distribution/titanium-conveyor.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 210 B

2
core/assets/bundles/bundle.properties
View File

@ -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

2
core/src/io/anuke/mindustry/content/Recipes.java
View File

@ -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));

6
core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java
View File

@ -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;
}};

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

@ -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);

6
core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java → core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
View File

@ -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);