From 61fea0337ff12fc00ab88430b6d4839ae79018ef Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 17 Feb 2022 10:44:01 -0500
Subject: [PATCH] Name fix

---
 core/src/mindustry/entities/comp/BuildingComp.java          | 3 +--
 .../world/blocks/defense/turrets/PayloadTurret.java         | 2 +-
 core/src/mindustry/world/blocks/units/UnitAssembler.java    | 2 +-
 .../mindustry/world/consumers/ConsumePayloadDynamic.java    | 6 +++---
 .../src/mindustry/world/consumers/ConsumePayloadFilter.java | 6 +++---
 core/src/mindustry/world/consumers/ConsumePayloads.java     | 6 +++---
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index a5c6c1d337..021850a20c 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -828,8 +828,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return null;
     }
 
-    public @Nullable
-    PayloadSeq getBlockPayloads(){
+    public @Nullable PayloadSeq getPayloads(){
         return null;
     }
 
diff --git a/core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java
index f89d0d4334..cdde30335c 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/PayloadTurret.java
@@ -135,7 +135,7 @@ public class PayloadTurret extends Turret{
         }
 
         @Override
-        public PayloadSeq getBlockPayloads(){
+        public PayloadSeq getPayloads(){
             return payloads;
         }
 
diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java
index 4b36f33704..b7ebd4263a 100644
--- a/core/src/mindustry/world/blocks/units/UnitAssembler.java
+++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java
@@ -535,7 +535,7 @@ public class UnitAssembler extends PayloadBlock{
         }
 
         @Override
-        public PayloadSeq getBlockPayloads(){
+        public PayloadSeq getPayloads(){
             return blocks;
         }
 
diff --git a/core/src/mindustry/world/consumers/ConsumePayloadDynamic.java b/core/src/mindustry/world/consumers/ConsumePayloadDynamic.java
index 9fc33d127f..6c4d48ee36 100644
--- a/core/src/mindustry/world/consumers/ConsumePayloadDynamic.java
+++ b/core/src/mindustry/world/consumers/ConsumePayloadDynamic.java
@@ -18,12 +18,12 @@ public class ConsumePayloadDynamic extends Consume{
 
     @Override
     public boolean valid(Building build){
-        return build.getBlockPayloads().contains(payloads.get(build));
+        return build.getPayloads().contains(payloads.get(build));
     }
 
     @Override
     public void trigger(Building build){
-        build.getBlockPayloads().remove(payloads.get(build));
+        build.getPayloads().remove(payloads.get(build));
     }
 
     @Override
@@ -48,7 +48,7 @@ public class ConsumePayloadDynamic extends Consume{
     }
 
     private void rebuild(Building build, Table table){
-        var inv = build.getBlockPayloads();
+        var inv = build.getPayloads();
         var pay = payloads.get(build);
 
         table.table(c -> {
diff --git a/core/src/mindustry/world/consumers/ConsumePayloadFilter.java b/core/src/mindustry/world/consumers/ConsumePayloadFilter.java
index 7e0ba4a638..c27d6e8810 100644
--- a/core/src/mindustry/world/consumers/ConsumePayloadFilter.java
+++ b/core/src/mindustry/world/consumers/ConsumePayloadFilter.java
@@ -25,7 +25,7 @@ public class ConsumePayloadFilter extends Consume{
 
     @Override
     public boolean valid(Building build){
-        var payloads = build.getBlockPayloads();
+        var payloads = build.getPayloads();
         for(var block : fitting){
             if(payloads.contains(block, 1)){
                 return true;
@@ -36,7 +36,7 @@ public class ConsumePayloadFilter extends Consume{
 
     @Override
     public void trigger(Building build){
-        var payloads = build.getBlockPayloads();
+        var payloads = build.getPayloads();
         for(var block : fitting){
             if(payloads.contains(block, 1)){
                 payloads.remove(block);
@@ -52,7 +52,7 @@ public class ConsumePayloadFilter extends Consume{
 
     @Override
     public void build(Building build, Table table){
-        var inv = build.getBlockPayloads();
+        var inv = build.getPayloads();
 
         MultiReqImage image = new MultiReqImage();
 
diff --git a/core/src/mindustry/world/consumers/ConsumePayloads.java b/core/src/mindustry/world/consumers/ConsumePayloads.java
index 5a497b52e5..4964d5a097 100644
--- a/core/src/mindustry/world/consumers/ConsumePayloads.java
+++ b/core/src/mindustry/world/consumers/ConsumePayloads.java
@@ -16,12 +16,12 @@ public class ConsumePayloads extends Consume{
 
     @Override
     public boolean valid(Building build){
-        return build.getBlockPayloads().contains(payloads);
+        return build.getPayloads().contains(payloads);
     }
 
     @Override
     public void trigger(Building build){
-        build.getBlockPayloads().remove(payloads);
+        build.getPayloads().remove(payloads);
     }
 
     @Override
@@ -38,7 +38,7 @@ public class ConsumePayloads extends Consume{
 
     @Override
     public void build(Building build, Table table){
-        var inv = build.getBlockPayloads();
+        var inv = build.getPayloads();
 
         table.table(c -> {
             int i = 0;