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

ReadI/WriteI interface for modding (and removal of if/else tree) (#11000)

Browse Source 
* progress

* progress

* moar progress

* commits every 5 seconds poggers (done with LogicBuild)

* implement interface

* oop forgor to remove part of the old ReadI

* unnecessary import removed

* who needs a space? i got a spare one

* implement great suggestion by [object Object]

* more of this

* slipped past me

* more consistency
This commit is contained in:
1ue999
2025-07-10 05:20:35 +02:00
committed by GitHub
parent b327f8be1f
commit 26b349e5dd
7 changed files with 114 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/src/mindustry/logic/LExecutor.java
View File

@@ -568,24 +568,15 @@ public class LExecutor{
@Override
public void run(LExecutor exec){
int address = position.numi();
Building from = target.building();
if(from instanceof MemoryBuild mem && (exec.privileged || (from.team == exec.team && !mem.block.privileged))){
output.setnum(address < 0 || address >= mem.memory.length ? 0 : mem.memory[address]);
}else if(from instanceof LogicBuild logic && (exec.privileged || (from.team == exec.team && !from.block.privileged)) && position.isobj && position.objval instanceof String name){
LVar fromVar = logic.executor.optionalVar(name);
if(fromVar != null && !output.constant){
output.objval = fromVar.objval;
output.numval = fromVar.numval;
output.isobj = fromVar.isobj;
Object targetObj = target.obj();
if(targetObj instanceof LReadable read){
if(!read.readable(exec)) return;
read.read(position, output);
}else{
int address = position.numi();
if(targetObj instanceof CharSequence str){
output.setnum(address < 0 || address >= str.length() ? Double.NaN : (int)str.charAt(address));
}
}else if(from instanceof MessageBuild msg){
output.setnum(address < 0 || address >= msg.message.length() ? Double.NaN : (int)msg.message.charAt(address));
}else if(target.isobj && target.objval instanceof CharSequence str){
output.setnum(address < 0 || address >= str.length() ? Double.NaN : (int)str.charAt(address));
}else if(from instanceof CanvasBuild canvas && (exec.privileged || (from.team == exec.team))){
output.setnum(canvas.getPixel(address));
}
}
}
@@ -604,20 +595,10 @@ public class LExecutor{
@Override
public void run(LExecutor exec){
int address = position.numi();
Building from = target.building();
if(from instanceof MemoryBuild mem && (exec.privileged || (from.team == exec.team && !mem.block.privileged)) && address >= 0 && address < mem.memory.length){
mem.memory[address] = value.num();
}else if(from instanceof LogicBuild logic && (exec.privileged || (from.team == exec.team && !from.block.privileged)) && position.isobj && position.objval instanceof String name){
LVar toVar = logic.executor.optionalVar(name);
if(toVar != null && !toVar.constant){
toVar.objval = value.objval;
toVar.numval = value.numval;
toVar.isobj = value.isobj;
}
}else if(from instanceof CanvasBuild canvas && (exec.privileged || (from.team == exec.team))){
canvas.setPixel(address, value.numi());
Object targetObj = target.obj();
if(targetObj instanceof LWritable write){
if(!write.writable(exec)) return;
write.write(position, value);
}
}
}
@@ -660,7 +641,7 @@ public class LExecutor{
}
}
}else{
if(target instanceof CharSequence seq && sense == LAccess.size){
if(target instanceof CharSequence seq && (sense == LAccess.size || sense == LAccess.bufferUsage)){
to.setnum(seq.length());
return;
}

6
core/src/mindustry/logic/LReadable.java Normal file
View File

@@ -0,0 +1,6 @@
package mindustry.logic;
public interface LReadable{
boolean readable(LExecutor exec);
void read(LVar position, LVar output);
}

6
core/src/mindustry/logic/LWritable.java Normal file
View File

@@ -0,0 +1,6 @@
package mindustry.logic;
public interface LWritable{
boolean writable(LExecutor exec);
void write(LVar position, LVar value);
}