Skip to content
This repository was archived by the owner on Apr 25, 2021. It is now read-only.

Commit 63929e7

Browse files
EcmaXpEcmaXp
committed
OpenPython v1.0 Ready
1 parent 222da96 commit 63929e7

File tree

255 files changed

+4298
-4226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+4298
-4226
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ apply plugin: 'net.minecraftforge.gradle.forge'
1717
apply plugin: 'com.github.johnrengelman.shadow'
1818
apply plugin: 'kotlin'
1919

20-
version = "0.9.9"
21-
group = "kr.pe.ecmaxp.openpie"
20+
version = "1.0.0"
21+
group = "kr.pe.ecmaxp.openpython"
2222
archivesBaseName = "OpenPie"
2323

2424
sourceCompatibility = targetCompatibility = '1.8'

‎src/main/java/kr/pe/ecmaxp/openpie/arch/consts/ByteSizeConsts.kt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/main/java/kr/pe/ecmaxp/openpie/OpenPie.kt renamed to src/main/java/kr/pe/ecmaxp/openpython/OpenPie.kt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package kr.pe.ecmaxp.openpie
1+
package kr.pe.ecmaxp.openpython
22

3-
import kr.pe.ecmaxp.openpie.arch.OpenComputersLikeSaveHandler
4-
import kr.pe.ecmaxp.openpie.arch.OpenPieArchitecture
5-
import kr.pe.ecmaxp.openpie.arch.OpenPieFirmware
3+
import kr.pe.ecmaxp.openpython.arch.OpenComputersLikeSaveHandler
4+
import kr.pe.ecmaxp.openpython.arch.OpenPythonFirmware
5+
import kr.pe.ecmaxp.openpython.arch.versions.OpenPythonArchitecture_v1_0
66
import li.cil.oc.api.FileSystem
77
import li.cil.oc.api.Items
88
import li.cil.oc.api.Machine
@@ -14,34 +14,34 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
1414

1515

1616
@Suppress("UNUSED_PARAMETER", "unused")
17-
@Mod(modid = OpenPie.MODID,
18-
name = OpenPie.NAME,
19-
version = OpenPie.VERSION,
17+
@Mod(modid = OpenPython.MODID,
18+
name = OpenPython.NAME,
19+
version = OpenPython.VERSION,
2020
dependencies = "required-after:forgelin;required-after:opencomputers;",
2121
modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter")
22-
object OpenPie {
23-
const val MODID = "openpie"
24-
const val NAME = "OpenPie"
25-
const val VERSION = "0.9.9"
22+
object OpenPython {
23+
const val MODID = "openpython"
24+
const val NAME = "OpenPython"
25+
const val VERSION = "1.0.0"
2626

2727
@Mod.EventHandler
2828
fun preInit(event: FMLPreInitializationEvent) {
2929
MinecraftForge.EVENT_BUS.register(OpenComputersLikeSaveHandler)
30-
Machine.add(OpenPieArchitecture::class.java)
30+
Machine.add(OpenPythonArchitecture_v1_0::class.java)
3131
}
3232

3333
@Mod.EventHandler
3434
fun init(event: FMLInitializationEvent) {
3535
Items.registerFloppy(
36-
"openpie",
36+
"openpython",
3737
EnumDyeColor.BLUE,
38-
{ FileSystem.fromClass(this.javaClass, OpenPie.MODID, "opos") },
38+
{ FileSystem.fromClass(this.javaClass, OpenPython.MODID, "opos") },
3939
true
40-
).setStackDisplayName("OpenPie (Operating System)")
40+
).setStackDisplayName("OpenPython OS (Operating System for micropython)")
4141

4242
Items.registerEEPROM(
43-
"EEPROM (OpenPie)",
44-
OpenPieFirmware.DEBUG.loadEEPROM(),
43+
"EEPROM (OpenPython BIOS)",
44+
OpenPythonFirmware.DEBUG.loadEEPROM(),
4545
byteArrayOf(),
4646
false
4747
)

src/main/java/kr/pe/ecmaxp/openpie/arch/OpenComputersLikeSaveHandler.kt renamed to src/main/java/kr/pe/ecmaxp/openpython/arch/OpenComputersLikeSaveHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package kr.pe.ecmaxp.openpie.arch
1+
package kr.pe.ecmaxp.openpython.arch
22

33
import li.cil.oc.api.machine.MachineHost
44
import net.minecraft.nbt.CompressedStreamTools

src/main/java/kr/pe/ecmaxp/openpie/arch/OpenPieArchitecture.kt renamed to src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPieArchitecture.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package kr.pe.ecmaxp.openpie.arch
1+
package kr.pe.ecmaxp.openpython.arch
22

3-
import kr.pe.ecmaxp.openpie.arch.consts.KB
3+
import kr.pe.ecmaxp.openpython.arch.consts.KB
44
import li.cil.oc.api.Driver
55
import li.cil.oc.api.driver.item.Memory
66
import li.cil.oc.api.machine.Architecture
@@ -10,10 +10,9 @@ import net.minecraft.item.ItemStack
1010
import net.minecraft.nbt.NBTTagCompound
1111

1212

13-
@Architecture.Name("micropython (OpenPie)")
14-
class OpenPieArchitecture(val machine: Machine) : Architecture {
13+
open class OpenPythonArchitecture(val machine: Machine) : Architecture {
1514
var totalMemory = 0
16-
var vm: OpenPieVirtualMachine? = null
15+
var vm: OpenPythonVirtualMachine? = null
1716
var lastSynchronizedResult: ExecutionResult? = null
1817

1918
override fun isInitialized(): Boolean {
@@ -24,9 +23,9 @@ class OpenPieArchitecture(val machine: Machine) : Architecture {
2423
close()
2524

2625
try {
27-
val firmware = OpenPieFirmware("debug") // TODO: OpenPieFirmware mapping
26+
val firmware = OpenPythonFirmware("debug") // TODO: OpenPythonFirmware mapping
2827
recomputeMemory(machine.host().internalComponents())
29-
vm = OpenPieVirtualMachine(machine, totalMemory, firmware)
28+
vm = OpenPythonVirtualMachine(machine, totalMemory, firmware)
3029
} catch (e: Exception) {
3130
e.printStackTrace()
3231
}

src/main/java/kr/pe/ecmaxp/openpie/arch/OpenPieFirmware.kt renamed to src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPieFirmware.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package kr.pe.ecmaxp.openpie.arch
1+
package kr.pe.ecmaxp.openpython.arch
22

3-
import kr.pe.ecmaxp.openpie.OpenPie
4-
import kr.pe.ecmaxp.openpie.arch.types.Entry
3+
import kr.pe.ecmaxp.openpython.OpenPython
4+
import kr.pe.ecmaxp.openpython.arch.types.Entry
55
import kr.pe.ecmaxp.thumbsf.CPU
66
import java.net.URL
77
import java.util.*
88

9-
class OpenPieFirmware(val name: String = "debug") {
9+
class OpenPythonFirmware(val name: String = "debug") {
1010
val protocol = 1
11-
private val path: String = "/assets/${OpenPie.MODID}/firmwares/$name"
11+
private val path: String = "/assets/${OpenPython.MODID}/firmwares/$name"
1212

1313
companion object {
14-
val DEBUG = OpenPieFirmware()
14+
val DEBUG = OpenPythonFirmware()
1515
}
1616

1717
init {
@@ -22,7 +22,7 @@ class OpenPieFirmware(val name: String = "debug") {
2222
}
2323

2424
private fun getResource(filename: String): URL {
25-
return OpenPieFirmware::class.java.getResource("$path/$filename")!!
25+
return OpenPythonFirmware::class.java.getResource("$path/$filename")!!
2626
}
2727

2828
fun loadFirmware(): ByteArray {

src/main/java/kr/pe/ecmaxp/openpie/arch/OpenPieInterruptHandler.kt renamed to src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPieInterruptHandler.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package kr.pe.ecmaxp.openpie.arch
1+
package kr.pe.ecmaxp.openpython.arch
22

3-
import kr.pe.ecmaxp.openpie.arch.consts.*
4-
import kr.pe.ecmaxp.openpie.arch.state.FileHandle
5-
import kr.pe.ecmaxp.openpie.arch.types.Interrupt
6-
import kr.pe.ecmaxp.openpie.arch.types.call.*
3+
import kr.pe.ecmaxp.openpython.arch.consts.*
4+
import kr.pe.ecmaxp.openpython.arch.state.FileHandle
5+
import kr.pe.ecmaxp.openpython.arch.types.Interrupt
6+
import kr.pe.ecmaxp.openpython.arch.types.call.*
77
import kr.pe.ecmaxp.thumbsf.consts.R7
88
import kr.pe.ecmaxp.thumbsf.signal.ControlPauseSignal
99
import kr.pe.ecmaxp.thumbsf.signal.ControlStopSignal
@@ -18,7 +18,7 @@ import java.io.FileNotFoundException
1818
import java.nio.charset.StandardCharsets
1919
import li.cil.oc.api.Machine as MachineAPI
2020

21-
class OpenPieInterruptHandler(val vm: OpenPieVirtualMachine) {
21+
class OpenPythonInterruptHandler(val vm: OpenPythonVirtualMachine) {
2222
operator fun invoke(intr: Interrupt, synchronized: Boolean) {
2323
try {
2424
val code: Int = when (intr.imm and (0xFFFF shl 16)) {
@@ -50,7 +50,7 @@ class OpenPieInterruptHandler(val vm: OpenPieVirtualMachine) {
5050
inner class UnknownInterrupt : Exception()
5151

5252
val machine: Machine get() = vm.machine
53-
val state: OpenPieVirtualMachineState get() = vm.state
53+
val state: OpenPythonVirtualMachineState get() = vm.state
5454

5555
private fun handleControl(intr: Interrupt, @Suppress("UNUSED_PARAMETER") synchronized: Boolean): Int {
5656
return when (intr.imm) {

src/main/java/kr/pe/ecmaxp/openpie/arch/OpenPieMemoryRegion.kt renamed to src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPieMemoryRegion.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package kr.pe.ecmaxp.openpie.arch
1+
package kr.pe.ecmaxp.openpython.arch
22

3-
import kr.pe.ecmaxp.openpie.arch.consts.KB
3+
import kr.pe.ecmaxp.openpython.arch.consts.KB
44
import kr.pe.ecmaxp.thumbsf.MemoryFlag
55
import kr.pe.ecmaxp.thumbsf.MemoryFlag.RW
66
import kr.pe.ecmaxp.thumbsf.MemoryFlag.RX
77

8-
enum class OpenPieMemoryRegion(val address: Int, val size: Int, val flag: MemoryFlag) {
8+
enum class OpenPythonMemoryRegion(val address: Int, val size: Int, val flag: MemoryFlag) {
99
FLASH(0x08000000, 256 * KB, RX),
1010
SRAM(0x20000000, 64 * KB, RW),
1111
RAM(0x60000000, 256 * KB, RW), // dynamic size

src/main/java/kr/pe/ecmaxp/openpie/arch/OpenPieVirtualMachine.kt renamed to src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPieVirtualMachine.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package kr.pe.ecmaxp.openpie.arch
1+
package kr.pe.ecmaxp.openpython.arch
22

3-
import kr.pe.ecmaxp.openpie.arch.OpenPieMemoryRegion.*
4-
import kr.pe.ecmaxp.openpie.arch.types.Interrupt
3+
import kr.pe.ecmaxp.openpython.arch.OpenPythonMemoryRegion.*
4+
import kr.pe.ecmaxp.openpython.arch.types.Interrupt
55
import kr.pe.ecmaxp.thumbsf.CPU
66
import kr.pe.ecmaxp.thumbsf.consts.I0
77
import kr.pe.ecmaxp.thumbsf.consts.PC
@@ -16,10 +16,10 @@ import java.util.zip.GZIPInputStream
1616
import java.util.zip.GZIPOutputStream
1717

1818

19-
class OpenPieVirtualMachine internal constructor(val machine: Machine, val memorySize: Int, var firmware: OpenPieFirmware) {
19+
class OpenPythonVirtualMachine internal constructor(val machine: Machine, val memorySize: Int, var firmware: OpenPythonFirmware) {
2020
val cpu: CPU = CPU()
21-
var state: OpenPieVirtualMachineState = OpenPieVirtualMachineState()
22-
var interruptHandler: OpenPieInterruptHandler = OpenPieInterruptHandler(this)
21+
var state: OpenPythonVirtualMachineState = OpenPythonVirtualMachineState()
22+
var interruptHandler: OpenPythonInterruptHandler = OpenPythonInterruptHandler(this)
2323

2424
init {
2525
val memory = cpu.memory.apply {
@@ -69,7 +69,7 @@ class OpenPieVirtualMachine internal constructor(val machine: Machine, val memor
6969
val firmwareTag = rootTag.getCompoundTag("firmware")
7070
val firmwareName = firmwareTag.getString("name")
7171
if (firmware.name != firmwareName)
72-
firmware = OpenPieFirmware(firmwareName)
72+
firmware = OpenPythonFirmware(firmwareName)
7373

7474

7575
// cpu

src/main/java/kr/pe/ecmaxp/openpie/arch/OpenPieVirtualMachineState.kt renamed to src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPieVirtualMachineState.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package kr.pe.ecmaxp.openpie.arch
1+
package kr.pe.ecmaxp.openpython.arch
22

3-
import kr.pe.ecmaxp.openpie.arch.state.FileHandle
4-
import kr.pe.ecmaxp.openpie.arch.state.ValueContainerMap
3+
import kr.pe.ecmaxp.openpython.arch.state.FileHandle
4+
import kr.pe.ecmaxp.openpython.arch.state.ValueContainerMap
55
import li.cil.oc.api.Persistable
66
import net.minecraft.nbt.NBTTagCompound
77
import net.minecraft.nbt.NBTTagList
88
import java.util.*
99

10-
class OpenPieVirtualMachineState : Persistable {
10+
class OpenPythonVirtualMachineState : Persistable {
1111
var fdCount = 3
1212
var fdMap: HashMap<Int, FileHandle> = HashMap()
1313
var valueMap: ValueContainerMap = ValueContainerMap()

0 commit comments

Comments
 (0)