버전 업데이트

Author: EcmaXp

src/main/java/kr/pe/ecmaxp/openpython/OpenPython.kt

@@ -18,11 +18,12 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
         name = OpenPython.NAME,
         version = OpenPython.VERSION,
         dependencies = "required-after:forgelin;required-after:opencomputers;",
-        modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter")
+        modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter"
+        /*@MCVERSIONDEP@*/)
 object OpenPython {
     const val MODID = "openpython"
     const val NAME = "OpenPython"
-    const val VERSION = "1.0.0"
+    const val VERSION = "1.0.1"
 
     @Mod.EventHandler
     fun preInit(event: FMLPreInitializationEvent) {
@@ -41,7 +42,7 @@ object OpenPython {
 
         Items.registerEEPROM(
                 "EEPROM (OpenPython BIOS)",
-                OpenPythonFirmware.v1_0_0.loadEEPROM(),
+                OpenPythonFirmware.v1_0_1.loadEEPROM(),
                 byteArrayOf(),
                 false
         )

src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPythonArchitecture.kt

@@ -23,7 +23,7 @@ open class OpenPythonArchitecture(val machine: Machine) : Architecture {
         close()
 
         try {
-            val firmware = OpenPythonFirmware("v1.0.0") // TODO: OpenPythonFirmware mapping
+            val firmware = OpenPythonFirmware.v1_0_1
             recomputeMemory(machine.host().internalComponents())
             vm = OpenPythonVirtualMachine(machine, totalMemory, firmware)
         } catch (e: Exception) {

src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPythonFirmware.kt

@@ -11,7 +11,7 @@ class OpenPythonFirmware(val name: String) {
     private val path: String = "/assets/${OpenPython.MODID}/firmwares/$name"
 
     companion object {
-        val v1_0_0 = OpenPythonFirmware("v1.0.0")
+        val v1_0_1 = OpenPythonFirmware("v1.0.1")
     }
 
     init {

src/main/java/kr/pe/ecmaxp/openpython/arch/OpenPythonVirtualMachine.kt

@@ -68,8 +68,18 @@ class OpenPythonVirtualMachine internal constructor(val machine: Machine, val me
         // firmware
         val firmwareTag = rootTag.getCompoundTag("firmware")
         val firmwareName = firmwareTag.getString("name")
-        if (firmware.name != firmwareName)
-            firmware = OpenPythonFirmware(firmwareName)
+        if (firmware.name != firmwareName) {
+            try {
+                firmware = OpenPythonFirmware(firmwareName)
+            } catch (e: Exception) {
+                if (firmwareName.startsWith("v1.0.")) {
+                    e.printStackTrace()
+                    firmware = OpenPythonFirmware.v1_0_1
+                } else {
+                    throw e;
+                }
+            }
+        }
 
 
         // cpu

src/main/java/kr/pe/ecmaxp/openpython/console/OpenPieBenchmark.kt

@@ -17,7 +17,7 @@ object OpenPythonBenchmark {
     @JvmStatic
     fun main(args: Array<String>) {
         val cpu = CPU()
-        val firmware = OpenPythonFirmware.v1_0_0
+        val firmware = OpenPythonFirmware.v1_0_1
         cpu.memory.apply {
             flash(FLASH.address, FLASH.size, firmware.loadFirmware())
             map(SRAM.address, SRAM.size, MemoryFlag.RW) // ram