From 020c6388c2ce0d16064382405f5eda1cc8d12d78 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 16 Aug 2018 18:38:04 -0400 Subject: [PATCH] Block renaming --- .../distribution/{splitter.png => router.png} | Bin .../blocks/distribution/titanium-conveyor.png | Bin 210 -> 0 bytes core/assets/bundles/bundle.properties | 2 -- core/src/io/anuke/mindustry/content/Recipes.java | 2 +- .../content/blocks/DistributionBlocks.java | 6 +++--- .../world/blocks/distribution/OverflowGate.java | 2 +- .../distribution/{Splitter.java => Router.java} | 6 +++--- 7 files changed, 8 insertions(+), 10 deletions(-) rename core/assets-raw/sprites/blocks/distribution/{splitter.png => router.png} (100%) delete mode 100644 core/assets-raw/sprites/blocks/distribution/titanium-conveyor.png rename core/src/io/anuke/mindustry/world/blocks/distribution/{Splitter.java => Router.java} (96%) diff --git a/core/assets-raw/sprites/blocks/distribution/splitter.png b/core/assets-raw/sprites/blocks/distribution/router.png similarity index 100% rename from core/assets-raw/sprites/blocks/distribution/splitter.png rename to core/assets-raw/sprites/blocks/distribution/router.png diff --git a/core/assets-raw/sprites/blocks/distribution/titanium-conveyor.png b/core/assets-raw/sprites/blocks/distribution/titanium-conveyor.png deleted file mode 100644 index d25210902add81eee2135b8415adef0e1a757b5f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqoCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#5u2z08~f_xmkWVHk|nMYCC>S|xv6<249-QVi6yBi3gww484B*6z5(HleBwYw zKAtX)ArhCD_HX2EaNuFqw{MKDQgJ(3cIH47M^#k*hmZv&{YOflAKH|Bw{PDWVTRw8 zi~+Vro4pU2@n4l@mTJgV*_-$^pLf66kr&T++c&Fzx?|YT2sD?$)78&qol`;+0Q7!B A6#xJL diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c66ef58c8a..cb5bf10f69 100644 --- a/core/assets/bundles/bundle.properties +++ b/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 diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 1036d675e2..6ad73c5334 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/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)); diff --git a/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java index f55abaccc3..c5696fb30e 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java +++ b/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; }}; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java index 48d2a67245..435eeaaebe 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java +++ b/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); diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java similarity index 96% rename from core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java rename to core/src/io/anuke/mindustry/world/blocks/distribution/Router.java index 964bf3ca53..0c262fa768 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java +++ b/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);