From fecf68e8163dcbe5fbdfffd3219f3aa468072456 Mon Sep 17 00:00:00 2001 From: Astoria Date: Tue, 9 Apr 2024 11:21:44 -0500 Subject: [PATCH] Bus: still broken! --- .../net/brokenmoon/redcontrol/api/RCBus.java | 1 + .../net/brokenmoon/redcontrol/api/RCCpu.java | 7 ++--- .../brokenmoon/redcontrol/api/RCRedbus.java | 29 +++++++++++++++++ .../redcontrol/blockentities/CpuEntity.java | 31 +++++++++++++------ .../redcontrol/blockentities/Peripheral.java | 1 + .../redcontrol/blocks/NetworkCarrier.java | 6 ++-- 6 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 src/main/java/net/brokenmoon/redcontrol/api/RCRedbus.java diff --git a/src/main/java/net/brokenmoon/redcontrol/api/RCBus.java b/src/main/java/net/brokenmoon/redcontrol/api/RCBus.java index b2197bd..47781e9 100644 --- a/src/main/java/net/brokenmoon/redcontrol/api/RCBus.java +++ b/src/main/java/net/brokenmoon/redcontrol/api/RCBus.java @@ -2,6 +2,7 @@ package net.brokenmoon.redcontrol.api; import com.simon816.j65el02.Bus; import com.simon816.j65el02.device.Device; +import com.simon816.j65el02.device.Memory; import com.simon816.j65el02.device.RedBus; import net.brokenmoon.redcontrol.RedControl; import net.brokenmoon.redcontrol.blockentities.Peripheral; diff --git a/src/main/java/net/brokenmoon/redcontrol/api/RCCpu.java b/src/main/java/net/brokenmoon/redcontrol/api/RCCpu.java index f27540b..b097033 100644 --- a/src/main/java/net/brokenmoon/redcontrol/api/RCCpu.java +++ b/src/main/java/net/brokenmoon/redcontrol/api/RCCpu.java @@ -14,9 +14,9 @@ public class RCCpu extends Cpu { private CpuEntity cpuEntity; private Memory ram = new Memory(0x0000, 0x2000);; - public RCCpu(CpuEntity cpuEntity) { + public RCCpu(CpuEntity cpuEntity, RCBus bus) { this.cpuEntity = cpuEntity; - this.setBus(this.cpuEntity.getBus()); + this.setBus(bus); } public void setInterrupt(boolean val){ @@ -40,8 +40,7 @@ public class RCCpu extends Cpu { @Override public void setBus(Bus bus) { super.setBus(bus); - if(!cpuEntity.notTicked) - getBus().addDevice(this.ram); + this.getBus().addDevice(this.ram); } public Memory getRam() { diff --git a/src/main/java/net/brokenmoon/redcontrol/api/RCRedbus.java b/src/main/java/net/brokenmoon/redcontrol/api/RCRedbus.java new file mode 100644 index 0000000..6d08cf3 --- /dev/null +++ b/src/main/java/net/brokenmoon/redcontrol/api/RCRedbus.java @@ -0,0 +1,29 @@ +package net.brokenmoon.redcontrol.api; + +import com.simon816.j65el02.device.RedBus; +import net.brokenmoon.redcontrol.RedControl; + +public class RCRedbus extends RedBus { + @Override + public void write(int address, int data) { + if (!this.enabled) { + return; + } + Peripheral peripheral = this.peripherals[this.activeDeviceId]; + if (peripheral != null) { + peripheral.write(address, data & 0xff); + } + } + + @Override + public void setActiveDevice(int id) { + RedControl.LOGGER.info("Active device is now " + id); + this.activeDeviceId = id; + } + + @Override + public int getActiveDevice() { + RedControl.LOGGER.info("Active device is being read, and it is " + activeDeviceId); + return this.activeDeviceId; + } +} diff --git a/src/main/java/net/brokenmoon/redcontrol/blockentities/CpuEntity.java b/src/main/java/net/brokenmoon/redcontrol/blockentities/CpuEntity.java index edb37cc..8fd928a 100644 --- a/src/main/java/net/brokenmoon/redcontrol/blockentities/CpuEntity.java +++ b/src/main/java/net/brokenmoon/redcontrol/blockentities/CpuEntity.java @@ -1,9 +1,11 @@ package net.brokenmoon.redcontrol.blockentities; +import com.simon816.j65el02.Bus; import com.simon816.j65el02.device.*; import net.brokenmoon.redcontrol.RedControl; import net.brokenmoon.redcontrol.api.RCBus; import net.brokenmoon.redcontrol.api.RCCpu; +import net.brokenmoon.redcontrol.api.RCRedbus; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -29,16 +31,22 @@ public class CpuEntity extends Peripheral{ private int defaultDriveId = 2; public CpuEntity(BlockPos pos, BlockState state) { super(RedControl.CPU_BLOCK_ENTITY, pos, state, 0); - RedControl.LOGGER.info("Making CpuEntity"); - } public static void tick(World world, BlockPos pos, BlockState state, CpuEntity be) { if(be.notTicked) { - be.cpu = new RCCpu(be); - be.setBus(new RCBus(new RedBus(), world, pos)); - be.cpu.setBus(be.getBus()); - be.cpu.getBus().addDevice(be.cpu.getRam()); + RCBus bus; + if(be.getBus() == null) { + bus = new RCBus(new RCRedbus(), world, pos); + be.bus = bus; + } else { + bus = be.getBus(); + } + if (be.cpu == null){ + RedControl.LOGGER.info("Making CpuEntity"); + be.cpu = new RCCpu(be, bus); + } + try { be.cpu.getRam().loadFromFile(be.bootloader, 0x400, 0x100); } catch (IOException e) { @@ -54,9 +62,14 @@ public class CpuEntity extends Peripheral{ } } - - public void setPeripheral(int id, RedBus.Peripheral peripheral) { - this.getBus().getRedBus().setPeripheral(id, peripheral); + @Override + public void setBus(RCBus bus){ + this.bus = bus; + if(cpu == null) { + RedControl.LOGGER.info("Making CpuEntity setbus edition"); + this.cpu = new RCCpu(this, bus); + } + this.cpu.setBus(bus); } public int getDefaultDriveId() { diff --git a/src/main/java/net/brokenmoon/redcontrol/blockentities/Peripheral.java b/src/main/java/net/brokenmoon/redcontrol/blockentities/Peripheral.java index b1d462a..4ef3da4 100644 --- a/src/main/java/net/brokenmoon/redcontrol/blockentities/Peripheral.java +++ b/src/main/java/net/brokenmoon/redcontrol/blockentities/Peripheral.java @@ -33,6 +33,7 @@ public abstract class Peripheral extends BlockEntity implements RedBus.Periphera public void setBus(RCBus bus){ this.bus = bus; + this.bus.getRedBus().setPeripheral(id, this); } public int getId() { diff --git a/src/main/java/net/brokenmoon/redcontrol/blocks/NetworkCarrier.java b/src/main/java/net/brokenmoon/redcontrol/blocks/NetworkCarrier.java index 5e9c3b3..f665b47 100644 --- a/src/main/java/net/brokenmoon/redcontrol/blocks/NetworkCarrier.java +++ b/src/main/java/net/brokenmoon/redcontrol/blocks/NetworkCarrier.java @@ -2,6 +2,7 @@ package net.brokenmoon.redcontrol.blocks; import com.simon816.j65el02.device.RedBus; import net.brokenmoon.redcontrol.api.RCBus; +import net.brokenmoon.redcontrol.api.RCRedbus; import net.brokenmoon.redcontrol.blockentities.Peripheral; import net.minecraft.block.*; import net.minecraft.entity.LivingEntity; @@ -54,9 +55,8 @@ public abstract class NetworkCarrier extends BlockWithEntity implements BlockEnt Block worldBlock = world.getBlockState(pos).getBlock(); if(world.getBlockEntity(pos) instanceof Peripheral){ Peripheral entityBlock = (Peripheral) world.getBlockEntity(pos); - if(entityBlock.getBus() == null) - entityBlock.setBus(new RCBus(new RedBus(), world, pos)); - entityBlock.getBus().getRedBus().setPeripheral(entityBlock.getId(), entityBlock); + RCBus bus = new RCBus(new RCRedbus(), world, pos); + entityBlock.setBus(bus); entityBlock.getBus().setValid(true); floodBus(entityBlock.getBus(), world, pos); }