Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name fix

Browse Source
This commit is contained in:
Anuken
2022-02-17 10:44:01 -05:00
parent fd764bd517
commit 61fea0337f
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -828,8 +828,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
return null; return null;
} }
public @Nullable public @Nullable PayloadSeq getPayloads(){
PayloadSeq getBlockPayloads(){
return null; return null;
} }

2
core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java
View File

@@ -135,7 +135,7 @@ public class PayloadTurret extends Turret{
} }
@Override @Override
public PayloadSeq getBlockPayloads(){ public PayloadSeq getPayloads(){
return payloads; return payloads;
} }

2
core/src/mindustry/world/blocks/units/UnitAssembler.java
View File

@@ -535,7 +535,7 @@ public class UnitAssembler extends PayloadBlock{
} }
@Override @Override
public PayloadSeq getBlockPayloads(){ public PayloadSeq getPayloads(){
return blocks; return blocks;
} }

6
core/src/mindustry/world/consumers/ConsumePayloadDynamic.java
View File

@@ -18,12 +18,12 @@ public class ConsumePayloadDynamic extends Consume{
@Override @Override
public boolean valid(Building build){ public boolean valid(Building build){
return build.getBlockPayloads().contains(payloads.get(build)); return build.getPayloads().contains(payloads.get(build));
} }
@Override @Override
public void trigger(Building build){ public void trigger(Building build){
build.getBlockPayloads().remove(payloads.get(build)); build.getPayloads().remove(payloads.get(build));
} }
@Override @Override
@@ -48,7 +48,7 @@ public class ConsumePayloadDynamic extends Consume{
} }
private void rebuild(Building build, Table table){ private void rebuild(Building build, Table table){
var inv = build.getBlockPayloads(); var inv = build.getPayloads();
var pay = payloads.get(build); var pay = payloads.get(build);
table.table(c -> { table.table(c -> {

6
core/src/mindustry/world/consumers/ConsumePayloadFilter.java
View File

@@ -25,7 +25,7 @@ public class ConsumePayloadFilter extends Consume{
@Override @Override
public boolean valid(Building build){ public boolean valid(Building build){
var payloads = build.getBlockPayloads(); var payloads = build.getPayloads();
for(var block : fitting){ for(var block : fitting){
if(payloads.contains(block, 1)){ if(payloads.contains(block, 1)){
return true; return true;
@@ -36,7 +36,7 @@ public class ConsumePayloadFilter extends Consume{
@Override @Override
public void trigger(Building build){ public void trigger(Building build){
var payloads = build.getBlockPayloads(); var payloads = build.getPayloads();
for(var block : fitting){ for(var block : fitting){
if(payloads.contains(block, 1)){ if(payloads.contains(block, 1)){
payloads.remove(block); payloads.remove(block);
@@ -52,7 +52,7 @@ public class ConsumePayloadFilter extends Consume{
@Override @Override
public void build(Building build, Table table){ public void build(Building build, Table table){
var inv = build.getBlockPayloads(); var inv = build.getPayloads();
MultiReqImage image = new MultiReqImage(); MultiReqImage image = new MultiReqImage();

6
core/src/mindustry/world/consumers/ConsumePayloads.java
View File

@@ -16,12 +16,12 @@ public class ConsumePayloads extends Consume{
@Override @Override
public boolean valid(Building build){ public boolean valid(Building build){
return build.getBlockPayloads().contains(payloads); return build.getPayloads().contains(payloads);
} }
@Override @Override
public void trigger(Building build){ public void trigger(Building build){
build.getBlockPayloads().remove(payloads); build.getPayloads().remove(payloads);
} }
@Override @Override
@@ -38,7 +38,7 @@ public class ConsumePayloads extends Consume{
@Override @Override
public void build(Building build, Table table){ public void build(Building build, Table table){
var inv = build.getBlockPayloads(); var inv = build.getPayloads();
table.table(c -> { table.table(c -> {
int i = 0; int i = 0;