Sector refactoring, invasions and cleanup

This commit is contained in:
Anuken
2020-10-16 11:02:24 -04:00
parent 5ee4101ba4
commit 2f54edf34f
27 changed files with 319 additions and 376 deletions

View File

@@ -121,9 +121,7 @@ public class LaunchPad extends Block{
return Core.bundle.format("launch.destination",
dest == null ? Core.bundle.get("sectors.nonelaunch") :
dest.preset == null ?
"[accent]Sector " + dest.id :
"[accent]" + dest.preset.localizedName);
"[accent]" + dest.name());
}).pad(4);
}
@@ -213,7 +211,7 @@ public class LaunchPad extends Block{
//actually launch the items upon removal
if(team() == state.rules.defaultTeam){
if(destsec != null && (destsec != state.rules.sector || net.client())){
ItemSeq dest = destsec.getExtraItems();
ItemSeq dest = new ItemSeq();
for(ItemStack stack : stacks){
dest.add(stack);
@@ -223,7 +221,7 @@ public class LaunchPad extends Block{
Events.fire(new LaunchItemEvent(stack));
}
destsec.setExtraItems(dest);
destsec.addItems(dest);
}
}
}

View File

@@ -156,7 +156,7 @@ public class Conveyor extends Block implements Autotiler{
lastInserted = build.lastInserted;
mid = build.mid;
minitem = build.minitem;
items.addAll(build.items);
items.add(build.items);
}
}

View File

@@ -203,7 +203,7 @@ public class StackConveyor extends Block implements Autotiler{
if(front() instanceof StackConveyorBuild e && e.team == team){
// sleep if its occupied
if(e.link == -1){
e.items.addAll(items);
e.items.add(items);
e.lastItem = lastItem;
e.link = tile.pos();
// ▲ to | from ▼

View File

@@ -70,7 +70,7 @@ public class StorageBlock extends Block{
public void overwrote(Seq<Building> previous){
for(Building other : previous){
if(other.items != null){
items.addAll(other.items);
items.add(other.items);
}
}