diff --git a/.gradle/7.4/checksums/checksums.lock b/.gradle/7.4/checksums/checksums.lock
deleted file mode 100644
index c116d6e55855c7dd312a6a41216317ba13f96c8e..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/checksums/checksums.lock and /dev/null differ
diff --git a/.gradle/7.4/checksums/md5-checksums.bin b/.gradle/7.4/checksums/md5-checksums.bin
deleted file mode 100644
index f82329528aa445a1fc3f355d07a55ef443b02416..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/checksums/md5-checksums.bin and /dev/null differ
diff --git a/.gradle/7.4/checksums/sha1-checksums.bin b/.gradle/7.4/checksums/sha1-checksums.bin
deleted file mode 100644
index 04a01d382f6e9255b2621d5f5f44301c99c3d749..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/checksums/sha1-checksums.bin and /dev/null differ
diff --git a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock
deleted file mode 100644
index 6da02854b1cb94dad15503682504f54ee59abad4..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock and /dev/null differ
diff --git a/.gradle/7.4/dependencies-accessors/gc.properties b/.gradle/7.4/dependencies-accessors/gc.properties
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin
deleted file mode 100644
index e415b10c4a3384551a3f147ca15895a966e25d4b..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/executionHistory/executionHistory.bin and /dev/null differ
diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock
deleted file mode 100644
index 6107f6b077d6ee9e36c21e1478bc1223f203b2f5..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/executionHistory/executionHistory.lock and /dev/null differ
diff --git a/.gradle/7.4/fileChanges/last-build.bin b/.gradle/7.4/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/fileChanges/last-build.bin and /dev/null differ
diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin
deleted file mode 100644
index c520d0e1e6feb9ee6ad386f2fe37d1c38df3c21f..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
deleted file mode 100644
index c0857717a520dbc17385ee4104726c84b107d025..0000000000000000000000000000000000000000
Binary files a/.gradle/7.4/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/.gradle/7.4/gc.properties b/.gradle/7.4/gc.properties
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/.gradle/7.5.1/checksums/checksums.lock b/.gradle/7.5.1/checksums/checksums.lock
index ee79fce184381ac4d90595c0d40cf431c6d989b3..238f52c84c228b860bdb3508d98c2588999e47d8 100644
Binary files a/.gradle/7.5.1/checksums/checksums.lock and b/.gradle/7.5.1/checksums/checksums.lock differ
diff --git a/.gradle/7.5.1/checksums/md5-checksums.bin b/.gradle/7.5.1/checksums/md5-checksums.bin
index 3532ba46001b4ecf5846f6882f2dfde073e09f79..183018332b2537ea2b1361b10f431ab24ddab7bf 100644
Binary files a/.gradle/7.5.1/checksums/md5-checksums.bin and b/.gradle/7.5.1/checksums/md5-checksums.bin differ
diff --git a/.gradle/7.5.1/checksums/sha1-checksums.bin b/.gradle/7.5.1/checksums/sha1-checksums.bin
index bd7f2d2b46cea1cf8fdcc02ae2d037db003a4d11..0828928b0696d620bdaa629af7b5c8d8651c2126 100644
Binary files a/.gradle/7.5.1/checksums/sha1-checksums.bin and b/.gradle/7.5.1/checksums/sha1-checksums.bin differ
diff --git a/.gradle/7.5.1/executionHistory/executionHistory.bin b/.gradle/7.5.1/executionHistory/executionHistory.bin
index eeed50a76f7bde001774274763b4f59e2b0dd87a..c9381695f94132bce29efcd9e1fcceef40b7ff3a 100644
Binary files a/.gradle/7.5.1/executionHistory/executionHistory.bin and b/.gradle/7.5.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/7.5.1/executionHistory/executionHistory.lock b/.gradle/7.5.1/executionHistory/executionHistory.lock
index 061e03c7782235967ec0899246e896b3680d0088..7019d4a24f0e2d0f26e7b69a7745bf73ebce4b94 100644
Binary files a/.gradle/7.5.1/executionHistory/executionHistory.lock and b/.gradle/7.5.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/7.5.1/fileHashes/fileHashes.bin b/.gradle/7.5.1/fileHashes/fileHashes.bin
index 5575b91d287a6fd0351f9c8aa04c6f3d48f145ae..5717b1b7921f272966597bc3111782be0aa6780d 100644
Binary files a/.gradle/7.5.1/fileHashes/fileHashes.bin and b/.gradle/7.5.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/7.5.1/fileHashes/fileHashes.lock b/.gradle/7.5.1/fileHashes/fileHashes.lock
index 43002137f4f3cd06e16d6ff8b29c6a0c3f86e409..0a19336e690e309127c6dc137027b6e23f05c10b 100644
Binary files a/.gradle/7.5.1/fileHashes/fileHashes.lock and b/.gradle/7.5.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index f560957f80123bc4e6db8bbfa9dba09a83dd2851..da4ed9f12d973a726682d878e39cd17a959d4706 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 906ab87471305bab333f9faad09e9ca85a15138c..58a5fe6a02807695b9a17cfba44d14b76b03f39a 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/.gradle/workspace-id.txt b/.gradle/workspace-id.txt
new file mode 100644
index 0000000000000000000000000000000000000000..555204d7c783667e4e49984f395834b78e2b171e
Binary files /dev/null and b/.gradle/workspace-id.txt differ
diff --git a/.gradle/workspace-id.txt.lock b/.gradle/workspace-id.txt.lock
new file mode 100644
index 0000000000000000000000000000000000000000..7f041dbc43302be5afebf9097eee9c48cd6c2018
Binary files /dev/null and b/.gradle/workspace-id.txt.lock differ
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2b63946d5b31084bbb7dda418ceb3d75eb686373
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9e39441c149d412e3f3f653a835378a28abcea6c..2ee44bad50a1d329c98daf3cb528b9bc4e3b869b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,50 +5,144 @@
</component>
<component name="ChangeListManager">
<list default="true" id="ec779897-06a9-43c6-9402-278f1567af53" name="Changes" comment="">
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/checksums/checksums.lock" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/checksums/md5-checksums.bin" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/checksums/sha1-checksums.bin" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/dependencies-accessors/gc.properties" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/executionHistory/executionHistory.bin" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/executionHistory/executionHistory.lock" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileChanges/last-build.bin" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.bin" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.lock" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.4/gc.properties" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.5.1/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5.1/checksums/checksums.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.5.1/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5.1/checksums/md5-checksums.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/7.5.1/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5.1/checksums/sha1-checksums.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/META-INF/javafx-game-starter-jdk17.kotlin_module" beforeDir="false" afterPath="$PROJECT_DIR$/build/classes/kotlin/main/META-INF/javafx-game-starter-jdk17.kotlin_module" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/Main.class" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/cell/Cell.class" beforeDir="false" afterPath="$PROJECT_DIR$/build/classes/kotlin/main/cell/Cell.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/cell/CellArray.class" beforeDir="false" afterPath="$PROJECT_DIR$/build/classes/kotlin/main/cell/CellArray.class" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/com/example/Game$Companion.class" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/com/example/Game$start$1.class" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/com/example/Game.class" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/com/example/MainKt.class" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/com/example/UtilKt.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/classes/kotlin/main/logic/CellController.class" beforeDir="false" afterPath="$PROJECT_DIR$/build/classes/kotlin/main/logic/CellController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.s" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/last-build.bin" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/cacheable/last-build.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/kotlin/compileKotlin/local-state/build-history.bin" beforeDir="false" afterPath="$PROJECT_DIR$/build/kotlin/compileKotlin/local-state/build-history.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/resources/main/space.png" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/build/resources/main/sun.png" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/cell/AliveCell.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/cell/AliveCell.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/cell/Cell.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/cell/Cell.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/kotlin/cell/CellArray.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/cell/CellArray.kt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/kotlin/com/example/Game.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/com/example/Game.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/cell/DeadCell.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/cell/DeadCell.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/cell/Position.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/cell/Position.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/com/example/Game.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/gui/Game.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/com/example/Main.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/main/Main.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/com/example/Util.kt" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/com/example/main.kts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/kotlin/gui/GamePanel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/gui/GamePanel.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/gui/MyFrame.kt" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/gui/MyMouseListener.kt" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/gui/MyMouseMotionListener.kt" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/kotlin/logic/Calculations.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/logic/Calculations.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/kotlin/logic/CellController.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/logic/CellController.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/space.png" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/sun.png" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -119,8 +213,14 @@
<recent name="$PROJECT_DIR$/src/kotlin" />
<recent name="$PROJECT_DIR$/src/main/main" />
</key>
+ <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+ <recent name="gui" />
+ </key>
+ <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="main" />
+ </key>
</component>
- <component name="RunManager" selected="Kotlin.MainKt">
+ <component name="RunManager" selected="Gradle.kotlin_gol [run]">
<configuration type="JetRunConfigurationType">
<option name="MAIN_CLASS_NAME" value="main/kotlin/com/example/Main" />
<module name="kotlin_gol" />
@@ -178,8 +278,9 @@
<method v="2" />
</configuration>
<configuration name="MainKt" type="JetRunConfigurationType" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.example.MainKt" />
+ <option name="MAIN_CLASS_NAME" value="main.MainKt" />
<module name="javafx-game-starter-jdk17.main" />
+ <shortenClasspath name="NONE" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -198,8 +299,8 @@
</list>
<recent_temporary>
<list>
- <item itemvalue="Kotlin.MainKt" />
<item itemvalue="Gradle.kotlin_gol [run]" />
+ <item itemvalue="Kotlin.MainKt" />
<item itemvalue="Gradle./home/ecki/projects/bme/kotlin/kotlin_gol [run]" />
</list>
</recent_temporary>
@@ -216,7 +317,7 @@
<workItem from="1669678533992" duration="1660000" />
<workItem from="1669709242168" duration="9901000" />
<workItem from="1669727783893" duration="730000" />
- <workItem from="1670160617320" duration="21310000" />
+ <workItem from="1670160617320" duration="25991000" />
</task>
<servers />
</component>
diff --git a/README.md b/README.md
index f6800f09211581e13ff5e6d8e8b7654e9e36f7c9..fe39fc0ffd56255e349feda6ca64ecb7bd3b7478 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
-# javafx-game-starter-jdk17
+# Game Of Life
-Basic JavaFX starter project that draws graphics on a canvas, based on JDK 17.
+Basic implementation of the Game Of Life that can start, pause or resume an active simulation.
+Born and survive parameters can be edited also.
+
+`Born: 3 Survive: 23` means, that a dead cell will be born if exactly 3 of the neighbouring cells are alive, and an alive cell survives if exactly 2 or 3 neighbouring cells are alive. Empty input means, it will not check for any alive cell, so it will die or won't be born. It's not the same if the input is 0.
+
+You can draw in the simulation with your mouse. This way it's possible to make cells alive.
Run the application with `./gradlew run`.
diff --git a/build.gradle b/build.gradle
index 7c4c45774f18aa2ba7a955a6883b8d494817d4e3..4adccc00f30f228cb9671e98594f653448546bf6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,4 +24,4 @@ javafx {
modules = [ 'javafx.controls', 'javafx.fxml' ]
}
-mainClassName = 'com.example.MainKt'
+mainClassName = 'main.MainKt'
diff --git a/build/classes/kotlin/main/META-INF/javafx-game-starter-jdk17.kotlin_module b/build/classes/kotlin/main/META-INF/javafx-game-starter-jdk17.kotlin_module
index ea11125f59dd79c486d1f3798a59986277f4df53..a38a38cabcf3be7251afd161d88d23c78d114f56 100644
Binary files a/build/classes/kotlin/main/META-INF/javafx-game-starter-jdk17.kotlin_module and b/build/classes/kotlin/main/META-INF/javafx-game-starter-jdk17.kotlin_module differ
diff --git a/build/classes/kotlin/main/Main.class b/build/classes/kotlin/main/Main.class
deleted file mode 100644
index 0d86faa3ebc32754e716a4b3c1cc1d9d78d1768e..0000000000000000000000000000000000000000
Binary files a/build/classes/kotlin/main/Main.class and /dev/null differ
diff --git a/build/classes/kotlin/main/cell/Cell.class b/build/classes/kotlin/main/cell/Cell.class
index 175da62eff8be4a233fd900dba7d0779f8963a7e..a66e9b18bd129a045cd665d8aa4b013392149567 100644
Binary files a/build/classes/kotlin/main/cell/Cell.class and b/build/classes/kotlin/main/cell/Cell.class differ
diff --git a/build/classes/kotlin/main/cell/CellArray.class b/build/classes/kotlin/main/cell/CellArray.class
index f05e44d5c521b86197100e0799398890e3a4af09..85c8e9755e753c51f0354ffa3cebbd97ef0759a2 100644
Binary files a/build/classes/kotlin/main/cell/CellArray.class and b/build/classes/kotlin/main/cell/CellArray.class differ
diff --git a/build/classes/kotlin/main/cell/Position.class b/build/classes/kotlin/main/cell/Position.class
index 6c2f31245b3c5da03227ee77794af78b67380729..5a4f06660e86e0302f1f3adee2dc12117bef1b56 100644
Binary files a/build/classes/kotlin/main/cell/Position.class and b/build/classes/kotlin/main/cell/Position.class differ
diff --git a/build/classes/kotlin/main/com/example/Game.class b/build/classes/kotlin/main/com/example/Game.class
deleted file mode 100644
index 3265efccbe3d6caf021d2ecb46ac56abea04c26e..0000000000000000000000000000000000000000
Binary files a/build/classes/kotlin/main/com/example/Game.class and /dev/null differ
diff --git a/build/classes/kotlin/main/com/example/UtilKt.class b/build/classes/kotlin/main/com/example/UtilKt.class
deleted file mode 100644
index 5dbf180b4a0c35b2bf87b9ad0ead959e171ddab1..0000000000000000000000000000000000000000
Binary files a/build/classes/kotlin/main/com/example/UtilKt.class and /dev/null differ
diff --git a/build/classes/kotlin/main/com/example/Game$Companion.class b/build/classes/kotlin/main/gui/Game$Companion.class
similarity index 61%
rename from build/classes/kotlin/main/com/example/Game$Companion.class
rename to build/classes/kotlin/main/gui/Game$Companion.class
index 7a3f7246e40c3bdfb19365b848e40225b978908b..7303b65f05567e1e1c81e210d9d5412422e9b812 100644
Binary files a/build/classes/kotlin/main/com/example/Game$Companion.class and b/build/classes/kotlin/main/gui/Game$Companion.class differ
diff --git a/build/classes/kotlin/main/com/example/Game$start$1.class b/build/classes/kotlin/main/gui/Game$start$1.class
similarity index 60%
rename from build/classes/kotlin/main/com/example/Game$start$1.class
rename to build/classes/kotlin/main/gui/Game$start$1.class
index 1e3e0145c2bf1d4b0fceba868285c72428308ab9..42fcf3eb09d7c6a47337aeffe0194f2297b38700 100644
Binary files a/build/classes/kotlin/main/com/example/Game$start$1.class and b/build/classes/kotlin/main/gui/Game$start$1.class differ
diff --git a/build/classes/kotlin/main/gui/Game.class b/build/classes/kotlin/main/gui/Game.class
new file mode 100644
index 0000000000000000000000000000000000000000..411180631844ba7618b9528cc6592dc6d9f69f4b
Binary files /dev/null and b/build/classes/kotlin/main/gui/Game.class differ
diff --git a/build/classes/kotlin/main/gui/GamePanel.class b/build/classes/kotlin/main/gui/GamePanel.class
index d81525c94baaff982b6e2d67ce4389f744db0685..5266d26c599101bfa4ac65ab84c2dac7f4af797d 100644
Binary files a/build/classes/kotlin/main/gui/GamePanel.class and b/build/classes/kotlin/main/gui/GamePanel.class differ
diff --git a/build/classes/kotlin/main/logic/CellController.class b/build/classes/kotlin/main/logic/CellController.class
index 6ed49759196f56212896cb518c4d8efb97feae34..070a8b49e0d88f4830340a1baa72c40fba53886b 100644
Binary files a/build/classes/kotlin/main/logic/CellController.class and b/build/classes/kotlin/main/logic/CellController.class differ
diff --git a/build/classes/kotlin/main/com/example/MainKt.class b/build/classes/kotlin/main/main/MainKt.class
similarity index 64%
rename from build/classes/kotlin/main/com/example/MainKt.class
rename to build/classes/kotlin/main/main/MainKt.class
index 7e29c94a15c18cd56b6aad5a058d31cbf658fc6d..994deaacbdcf311bd196580c0f0c966f0f9b986e 100644
Binary files a/build/classes/kotlin/main/com/example/MainKt.class and b/build/classes/kotlin/main/main/MainKt.class differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab
index 6782df2c857732c57e2a2d36ebb16f878cfc812b..043727443f8e5d54582ca0343e7974ec44a4bef7 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream
index b9e21d3a4991e790a1659fbf9bfb6a74fbc3e296..342e4a41ce94d9f1cb5989914eb87ed9c90636a9 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len
index d3d01ed27bcbd4474637280ea55c0aeb3b205c59..f01f42f3426bcc8a96b8cd7b25cdada4450a191e 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len
index 9911af5051faa67d9b81264a155131096082b4f3..a5413564614472ae2e55bb44e79510947726def0 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values
deleted file mode 100644
index 068c891a9edc19963f7a909b5701d96e7ccd11a3..0000000000000000000000000000000000000000
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values and /dev/null differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
index 88be293b933b89e03ad4e5147a264499be21defe..9c92eeae8bffae2975e1490ef98eb41a9286947b 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.s b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.s
deleted file mode 100644
index a2246811533f7c4903060613f7cc452d975ef7da..0000000000000000000000000000000000000000
--- a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.s
+++ /dev/null
@@ -1 +0,0 @@
-� � � � � � � � � � � � � � � � � � � � � � � �
\ No newline at end of file
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i
index 23efc50d3b05e7d63ea70a12c80220acd9240768..a7defc21c3be6238e51edd69b0cfd946f4d0712c 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab
index 8f17abded5c9d66179fd481b4f793d69ad1e0b18..bf9f556c6d2ed13ca8b392c7005c43268f04e0c6 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream
index 4fa4186463c785559cdeaa0e2b3e14b9216cf300..c22c64d7adebb63a90635d3df9785504cdf42f68 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len
index c6582fdc3dd92e56839c152530992177abaf2799..c74a057391d1fb928ca4100b2e2ebac53956d2f3 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len
index 6f677df7d85c99b1951f55f84f3d00c26757b7b3..a363176c8cf9dbf2868dabc2a7c34c549945aa8a 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at
index 360c223a2162e2048df141844a2d3393f5462e92..068e3bc39db7a48bc5dc0dddcebdf714242d1a0c 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i
index fdb76e0885632ca5c5aea14c60074ac26b29a8c5..ac7c9709dba056d545deb75a61842eb8846a90c9 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
index a3eea0a5247de1a578bb1dcb20bf66f9b6ff3d71..92f4a0d48dea309d260ee948b89c0d54c759a20c 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
index 4fa4186463c785559cdeaa0e2b3e14b9216cf300..c22c64d7adebb63a90635d3df9785504cdf42f68 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
index c6582fdc3dd92e56839c152530992177abaf2799..c74a057391d1fb928ca4100b2e2ebac53956d2f3 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
index 6f677df7d85c99b1951f55f84f3d00c26757b7b3..a363176c8cf9dbf2868dabc2a7c34c549945aa8a 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
index 0c2aedf15db98cbaff350b7e023ec61660b42e6e..5500650c6a7da116ee115bdb32ad8cc330b1505e 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
index fdb76e0885632ca5c5aea14c60074ac26b29a8c5..ac7c9709dba056d545deb75a61842eb8846a90c9 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab
index a7b75d35b7d3507e586245b13a56f3ebddd6929b..86355d6fadda762656040b257e07bf8d401d9312 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream
index 8c627202e24b5dc5b389e31793cafae2fa1f9854..809138b1ea14e7459f48f1d8255e5b626ab40853 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len
index 8f2199b102c42e976a6718ae19569b7dfb8b665c..9a6f654a2b1fe7f7cba4b266715a7a764968b486 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at
index b82fdc190a95435dd0f34db72cf78a3b42585ce4..1456a2f3140ea7a310f0a81d731a776fab3504b4 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i
index 7b906f781a682aa5d68962c605661d998b4739b8..3381d5652739d42f16b65d33f5f64cfc1e1dbf75 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/constants.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab
index d61c65c7665fcba0413cda9c8b7104d50d98a692..e300fa59770c3edb71b1445304189ee6bfe77787 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
index f2878611fb03296ae0689fc3118fa10e4aae3934..e1973e5bd05c8522ee114e09c48c69e53a22ed9e 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
index bceea21bd07b400ddc9a9e5a967c2d4f9c2d3bc0..9b86fcde47d91e6cc24455725e1cab76a7eece48 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
index 14f7c061cc4bef2fdb72d8ebd5cc8c9a23a22d1b..003bc0ebfc327ee4e08df4a177e7f368d2dea681 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
index dcbaba8f83f7f0c452e273b540c29c156a7bd9ac..ba0a4b892a725489e54ee96f0fb850e5a24eebf7 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
index b8532551406412de9e80255de8d2985c7881a21f..e7ad6851b6bd2404ab6db72e88a0f7e339d1a601 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab
index c22e951d5de81899a8c592c9f8e0d9f1010c89b0..bdf584a84b58bf0b45e9b3a4c946653433feaad2 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream
index 48432cbe565a65d1b91fa29e649b42ee331fdd11..e14489bfa8127bca62f56fee14e436be6591ccf9 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len
index 6645728579eeef54537466a274b09bb22b2e09e2..1ff194f2e9051d3504a0a2f471c66d87c2e41e59 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len
index 01bdaa1da7d937c7e7d98e54ba912f88ab95c7f2..2a17e6e5bd9e7704741c2a3ae485eb2d2e302b87 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at
index 6fcb00a84b3a1bca9ed654273f68daba3ae64ad7..46d6744972241d5e158860b121c8dcc129d1d042 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i
index 778d7e586a904c352be4b59569257d4f6d8796c1..dd710bc135d8c512561110f9b4a36b94ebed5c54 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/package-parts.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab
index eb5c14d4c5c59472d90daf720b39d89e4f29df99..11f8ab082f421b693f40d07c538c4e6ca682c904 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream
index 4237563574ab194a253c0ad7ef9825d097c6dc0e..18abb7c0e19730e52d358964978d49d3417c5a64 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len
index a0a88a6921dcebc89f7e9357a74e45e8b9b305dd..f4902b46ac9a6b7d5c33bd14c12130ed905cd5e1 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len
index 9911af5051faa67d9b81264a155131096082b4f3..003bc0ebfc327ee4e08df4a177e7f368d2dea681 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values
deleted file mode 100644
index cea0fc2a30eb28bad19aed64d01ab5a521e324c2..0000000000000000000000000000000000000000
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values and /dev/null differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at
index 66c275754bd993406ac243cdd2a2f4e545e6b8e2..3d23db3d2831d094e13408f76815418ae95f7a70 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s
deleted file mode 100644
index 69bcbfa4233e25ae93d6e4eac47d241e8f30c02f..0000000000000000000000000000000000000000
--- a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.s
+++ /dev/null
@@ -1 +0,0 @@
-�A�A�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�>�=�=�=�=�>�=�=�=�=�=�?�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@
\ No newline at end of file
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i
index 57ed840059d155d75f2f96f6958f89007c167fab..3a5b7468bde117b8a6b0ff4190cea852e0fd87a3 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab
index 3caf379ce75f4247f5a8cf0ed158ac36f3f59684..0d9953c9f38b6a0b0b499669d28c66455c677bf6 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
index 9c71c301dfacb348759b5b9b76d38773265676a3..cdcd7dbae63360933845b76ccc9319c2d1a52808 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
index d3d01ed27bcbd4474637280ea55c0aeb3b205c59..f01f42f3426bcc8a96b8cd7b25cdada4450a191e 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len
index 9911af5051faa67d9b81264a155131096082b4f3..a5413564614472ae2e55bb44e79510947726def0 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
index a092fb31f325311a322b91b6b0fe919747112661..4c20619a69d31952387145bb339dc11fc41bbdac 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i
index 1089874eb8e1842657d09b81d137a12c05b108dc..2cc4e92bc9bd4be52da057fd98d7b0c06e82a3b6 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab
index d6b184ea53a55663feb9fcec9abf20269d322151..ec472c35ff4b56701e667e30a1ef00915d53e4de 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream
index b71b67e47b9e5f2eb851d15b71f182edfe9aec15..cd5d02e2984ceecf763433783bb6ef6b048e7e10 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len
index 9c559e0cdfc92d16b845030441194d09e74833b4..70ec52b78261bb1998ceded8111a5a55bcc6d367 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len
index 93a595bd1bbabaf1bd4ee4909ac49e65e67fa3f4..a9f80ae0249093f1db8b14f71053acce35747e3d 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at
index 4f383b8fadb357fcea533d63311d351d620f9738..73457798d2b7ffed5d10e813dc5225888d7ff0dc 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i
index e9b70df84e5611b32eef99b5e1776cabadfa4ede..665eadf2b9ced3f9ab8c800eed07c57a9c60cd1d 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/subtypes.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab
index 50711d2f54c5478c7a39ed9b310d566be1e19f81..78816403e912be2b98b74bb1f4614d92e7d1731f 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream
index a897723927cc11050ff04a28cf2ef969f4ec7eb2..13fdac9c55102d259babaea190a7c5198e53de54 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len
index a8206a1a222cd6391bdfa126f97848d96ed66f71..3bb2dcc6ce3baa57676d845dd21df8491d46fd34 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len
index ec8f944c8acd49bcace4e4c78d4306ebd9e28078..93a595bd1bbabaf1bd4ee4909ac49e65e67fa3f4 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at
index 9ac84c64a5e14a3be07b7dd2708ed6b538201183..685a7576e21c6d0258e4c0bc7aa58c1404c2e71b 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i
index e8b809bdf3f9d040f554144b0ee22680c1f0002a..b869484099374a0c4b868414ecb907d2a379f572 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/jvm/kotlin/supertypes.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab
index 9153a30efffde0ec2af525c01213ab13251f8aa2..920202f822f04aff26af5bdf7724af8c860638fd 100644
--- a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab
+++ b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-12
+11
0
\ No newline at end of file
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab
index 5709446ccfd2f8202cad4b666b8cd5e0448a3ed2..09c9368aac91f1c7fde1d676bfaaeb86f8bd773b 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream
index 4d3aef9944525733664aaff0872312087e31d7be..cdcd7dbae63360933845b76ccc9319c2d1a52808 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len
index bcf252346917c282b7731e861590d88d0fbf7d1b..f01f42f3426bcc8a96b8cd7b25cdada4450a191e 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len
index 6f677df7d85c99b1951f55f84f3d00c26757b7b3..a5413564614472ae2e55bb44e79510947726def0 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at
index 071a2526db9c63afd965a4ef4a18fc976af5ff7c..c5eb8f1af4bd0eea9952b6892e17bd21fa66cff1 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i
index a611bcf7c8841f974f13f18d539b9749d675bee7..2cc4e92bc9bd4be52da057fd98d7b0c06e82a3b6 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab
index 0e1d8aefffd01270d5446ee1b26e29c917ae1404..7d2b56cd4cedf0ec01db2e035e958bf5c3347d85 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream
index 54555db390322005a3d6c3030f581ae72805c531..99cb6e96aa01b7ae2bbe8a72e4f5ef1e3b7a6fd8 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len
index 2b895e774deea3bb925caf1a5567bf65555bbe6b..c54fd0d994e56194f26ab957b17021b591efabe2 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len
index 14f7c061cc4bef2fdb72d8ebd5cc8c9a23a22d1b..09407efabbe5467ec2b0cdc5cce0a25e55419604 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at
index d8fe344258eb8debb632bd93e53393658c892910..e742712ef3478497d08adb97d0ba41921499df59 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i
index 41018a93c6b30454cefa6b650cadc18598d5f17c..504f86b425199f0368c180c4160388677b7a66ad 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/id-to-file.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab
index 10335d87d087f707e954384045ea808226e6287f..4777060ef87464efd8e810eca8853c9a2c68d526 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream
index d9e42e502a3166c923a2b1024d985595ccb5bb47..5cd978ab159ee346687c24a6731f8394816c30b4 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len
index 54264a75adc4de6a031c61413fce7ec7ce0516f2..4bbbb8d8385a0bc02f4e900bec95d3b174593116 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len
index 9253b6df0fcf439b5f84b5e9cdd64d31585bf76b..feff6d795712a8b9fcafa079f1e3d65f148d4711 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.len differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values
index 4607ed0939c606bfaa6499c297f9aa000bff57a5..11ea61d457eb3a9718c9f67ba77ae7e6f1a10413 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at
index 9d446f255efb0f9f61b3be26b48f9f233843be2a..1ffda9525ebd3176f6fb429c058cc168fc75346b 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at differ
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s
index 33800f1dba250b1fe68295fe7d14c5314b141758..12110f3d9d733ed51a4e2a59b7f6c716de1471c9 100644
--- a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s
+++ b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s
@@ -1 +1 @@
-ҊЍՑ����̊ˊԍ��Ԏ��ŋ�����ē�Njˇևˇˇˇ߇��ψ��ׇ��ʖՒЋ�ҊNJ����ڊ���ӊ���͊͊͊���ɊьnjՉ�߉���ʙߐ�ԅʋƉDž����܇م���������������������������������ʂъֈ�ւււււււ�ււււ
\ No newline at end of file
+�|ӋNjʄ߂��������
\ No newline at end of file
diff --git a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i
index 6492db78f131d4fcc70a84dffd4821e98a46a2e2..1914621e4821a938dc811bc86aa0e2ab651b407b 100644
Binary files a/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i and b/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/lookups.tab_i differ
diff --git a/build/kotlin/compileKotlin/cacheable/last-build.bin b/build/kotlin/compileKotlin/cacheable/last-build.bin
index 1455d23bd7e6eacfb3f5f39c458659edf644b759..bf48023c28e016e91646a243fa91014a8c4d769b 100644
Binary files a/build/kotlin/compileKotlin/cacheable/last-build.bin and b/build/kotlin/compileKotlin/cacheable/last-build.bin differ
diff --git a/build/kotlin/compileKotlin/local-state/build-history.bin b/build/kotlin/compileKotlin/local-state/build-history.bin
index e38ddc0b135585b8ec2ed564b8295887bb4d20a8..bb4039ffcfc4d2a64559cac0ca26935a9c7ade11 100644
Binary files a/build/kotlin/compileKotlin/local-state/build-history.bin and b/build/kotlin/compileKotlin/local-state/build-history.bin differ
diff --git a/build/resources/main/space.png b/build/resources/main/space.png
deleted file mode 100644
index 9f4821ac80932eb4cbc99498692aaacddde14f3f..0000000000000000000000000000000000000000
Binary files a/build/resources/main/space.png and /dev/null differ
diff --git a/build/resources/main/sun.png b/build/resources/main/sun.png
deleted file mode 100644
index 8d08965346e0ea86af7b7f6b5a72572bb0d2508e..0000000000000000000000000000000000000000
Binary files a/build/resources/main/sun.png and /dev/null differ
diff --git a/src/main/kotlin/cell/AliveCell.kt b/src/main/kotlin/cell/AliveCell.kt
index 386ac4f5ad496b5db67dc7ff0a6e74b830c40213..8070728bfd28e1a0d5a75ac6cbd34ea14c25e8ed 100644
--- a/src/main/kotlin/cell/AliveCell.kt
+++ b/src/main/kotlin/cell/AliveCell.kt
@@ -11,7 +11,7 @@ class AliveCell(position: Position) : Cell(position) {
override fun paint(context: GraphicsContext) {
context.fill = Color.BLACK
- context.fillRect(getPositionX()*10.0, getPositionY()*10.0, 10.0, 10.0)
+ context.fillRect(positionX*10.0, positionY*10.0, 10.0, 10.0)
}
}
diff --git a/src/main/kotlin/cell/Cell.kt b/src/main/kotlin/cell/Cell.kt
index 116f30a9ea89b382f2ab36c1d68073b0c4bc2575..15a0469dcda309621d8594bebf73a47b06accb98 100644
--- a/src/main/kotlin/cell/Cell.kt
+++ b/src/main/kotlin/cell/Cell.kt
@@ -2,18 +2,13 @@ package cell
import javafx.scene.canvas.GraphicsContext
-abstract class Cell (position: Position) {
+abstract class Cell (val position: Position) {
private var mark: Boolean = false
- private val position: Position = position
- fun getPosition(): Position {return position}
+ val positionX = position.getX()
+ val positionY = position.getY()
+
abstract fun isAlive(): Boolean
- public fun setMark(stat: Boolean) { mark=stat }
- public fun getPositionX() : Int {
- return position.getX()
- }
- public fun getPositionY() : Int {
- return position.getY()
- }
+ fun setMark(stat: Boolean) { mark = stat }
fun getMark(): Boolean { return mark }
abstract fun paint(context: GraphicsContext)
diff --git a/src/main/kotlin/cell/CellArray.kt b/src/main/kotlin/cell/CellArray.kt
index d880b245151207d03f3256927dc59d5a57b4d8f4..a00a2719cea2853c0536926db83a1f21c873b456 100644
--- a/src/main/kotlin/cell/CellArray.kt
+++ b/src/main/kotlin/cell/CellArray.kt
@@ -3,6 +3,7 @@ package cell
class CellArray(width: Int, height: Int) {
val cells = ArrayList<ArrayList<Cell>>()
val indices: IntRange
+ val size: Int
init {
val x: Int = width / 10
@@ -14,18 +15,11 @@ class CellArray(width: Int, height: Int) {
cells.add(column)
}
this.indices = cells.indices
+ this.size = cells.size
}
fun size(): IntRange { return cells.indices }
operator fun get(i: Int) : ArrayList<Cell> {return cells[i]}
- fun set(c: CellArray) {
- cells.clear()
- cells.addAll(c.cells)
- }
-
- fun sizeInt(): Int {
- return cells.size
- }
}
diff --git a/src/main/kotlin/cell/DeadCell.kt b/src/main/kotlin/cell/DeadCell.kt
index e6bdf87d7a21d8456b4daaa1d15a2c977d4b52e9..370d88656570a5c0120934707e34664fe2c4e9fd 100644
--- a/src/main/kotlin/cell/DeadCell.kt
+++ b/src/main/kotlin/cell/DeadCell.kt
@@ -11,7 +11,7 @@ class DeadCell(position: Position) : Cell(position){
override fun paint(context: GraphicsContext) {
context.fill = Color.WHITE
- context.fillRect(getPositionX()*10.0, getPositionY()*10.0, 10.0, 10.0)
+ context.fillRect(positionX*10.0, positionY*10.0, 10.0, 10.0)
}
}
\ No newline at end of file
diff --git a/src/main/kotlin/cell/Position.kt b/src/main/kotlin/cell/Position.kt
index 02358b85623035faf87af92bb7137b73a2028707..f55e63838d6af07daa6acb3783fad85a58530378 100644
--- a/src/main/kotlin/cell/Position.kt
+++ b/src/main/kotlin/cell/Position.kt
@@ -1,14 +1,6 @@
package cell
public class Position(x: Int, y: Int) {
- private var x: Int = x
- private var y: Int = y
-
- public fun setPosition(x: Int, y: Int) {
- this.x = x
- this.y = y
- }
-
- public fun getX() : Int { return this.x }
- public fun getY() : Int { return this.y }
+ val x: Int = x
+ val y: Int = y
}
\ No newline at end of file
diff --git a/src/main/kotlin/com/example/Util.kt b/src/main/kotlin/com/example/Util.kt
deleted file mode 100644
index b60cd20c15986ac8afcb3935e40f4fa300f1871d..0000000000000000000000000000000000000000
--- a/src/main/kotlin/com/example/Util.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.example
-
-fun getResource(filename: String): String {
- return Game::class.java.getResource(filename).toString()
-}
diff --git a/src/main/kotlin/com/example/main.kts b/src/main/kotlin/com/example/main.kts
deleted file mode 100644
index 6a479626aea08a8485bd65423b840a3c672213c1..0000000000000000000000000000000000000000
--- a/src/main/kotlin/com/example/main.kts
+++ /dev/null
@@ -1,3 +0,0 @@
-val result = 2
-println(result.plus(1))
-println(result)
\ No newline at end of file
diff --git a/src/main/kotlin/com/example/Game.kt b/src/main/kotlin/gui/Game.kt
similarity index 70%
rename from src/main/kotlin/com/example/Game.kt
rename to src/main/kotlin/gui/Game.kt
index e46bd256d8d677036f040d9a98f25c4985a68312..8d7d9bd85309408161f82eff0d54f18222c12200 100644
--- a/src/main/kotlin/com/example/Game.kt
+++ b/src/main/kotlin/gui/Game.kt
@@ -1,40 +1,31 @@
-package com.example
+package gui
-import gui.GamePanel
import javafx.animation.AnimationTimer
import javafx.application.Application
import javafx.event.EventHandler
import javafx.scene.Group
import javafx.scene.Scene
-import javafx.scene.canvas.GraphicsContext
import javafx.scene.control.Button
import javafx.scene.control.Label
import javafx.scene.control.TextField
-import javafx.scene.input.KeyCode
import javafx.stage.Stage
class Game : Application() {
companion object {
const val padding: Double = 5.0
- private const val WIDTH = 520
- private const val HEIGHT = 520
+ private const val WIDTH = 600
+ private const val HEIGHT = 400
}
private lateinit var mainScene: Scene
- private lateinit var graphicsContext: GraphicsContext
-
- private var gamePanel = GamePanel(HEIGHT-30, WIDTH)
-
+ private var gamePanel = GamePanel(WIDTH, HEIGHT)
private var pause: Boolean = true
private var lastFrameTime: Long = System.nanoTime()
- // use a set so duplicates are not possible
- private val currentlyActiveKeys = mutableSetOf<KeyCode>()
-
override fun start(mainStage: Stage) {
mainStage.title = "Game Of Life"
@@ -43,7 +34,24 @@ class Game : Application() {
mainScene = Scene(root)
mainStage.scene = mainScene
+ initComponents(root)
+
+ mainStage.minWidth = root.prefWidth(0.0)
+ mainStage.minHeight = root.prefHeight(0.0)
+
+ prepareActionHandlers()
+
+ // Main loop
+ object : AnimationTimer() {
+ override fun handle(currentNanoTime: Long) {
+ tickAndRender(currentNanoTime)
+ }
+ }.start()
+
+ mainStage.show()
+ }
+ private fun initComponents(root: Group) {
val startButton = Button("Start").apply {
setOnAction {
if (pause) {
@@ -55,41 +63,40 @@ class Game : Application() {
}
}
prefWidth = 70.0
- layoutX = Game.padding
- layoutY = Game.padding
+ layoutX = Companion.padding
+ layoutY = Companion.padding
}.also {
root.children.add(it)
}
-
val bornText = Label("Born:").apply {
prefWidth = 50.0
layoutX = startButton.layoutX + startButton.prefWidth + 5.0
- layoutY = Game.padding + 2.0
+ layoutY = Companion.padding + 2.0
}.also {
root.children.add(it)
}
val bornTextField = TextField("3").apply {
prefWidth = 80.0
- layoutX = bornText.layoutX + bornText.prefWidth + Game.padding
- layoutY = Game.padding
+ layoutX = bornText.layoutX + bornText.prefWidth + Companion.padding
+ layoutY = Companion.padding
}.also {
root.children.add(it)
}
val surviveText = Label("Survive:").apply {
prefWidth = 60.0
- layoutX = bornTextField.layoutX + bornTextField.prefWidth + Game.padding
- layoutY = Game.padding + 2.0
+ layoutX = bornTextField.layoutX + bornTextField.prefWidth + Companion.padding
+ layoutY = Companion.padding + 2.0
}.also {
root.children.add(it)
}
val surviveTextField = TextField("23").apply {
prefWidth = 90.0
- layoutX = surviveText.layoutX + surviveText.prefWidth + Game.padding
- layoutY = Game.padding
+ layoutX = surviveText.layoutX + surviveText.prefWidth + Companion.padding
+ layoutY = Companion.padding
}.also {
root.children.add(it)
}
@@ -99,8 +106,8 @@ class Game : Application() {
gamePanel.setOrder(bornTextField.text, surviveTextField.text)
}
prefWidth = 50.0
- layoutX = surviveTextField.layoutX + surviveTextField.prefWidth + Game.padding
- layoutY = Game.padding
+ layoutX = surviveTextField.layoutX + surviveTextField.prefWidth + Companion.padding
+ layoutY = Companion.padding
}.also {
root.children.add(it)
}
@@ -109,41 +116,21 @@ class Game : Application() {
setOnAction {
gamePanel.setOrder("3", "23")
}
- layoutX = setButton.layoutX + setButton.prefWidth + Game.padding
- layoutY = Game.padding
+ layoutX = setButton.layoutX + setButton.prefWidth + Companion.padding
+ layoutY = Companion.padding
}.also {
root.children.add(it)
}
gamePanel.layoutY = startButton.layoutY + 30.0
root.children.add(gamePanel)
-
- prepareActionHandlers()
-
- graphicsContext = gamePanel.graphicsContext2D
-
- // Main loop
- object : AnimationTimer() {
- override fun handle(currentNanoTime: Long) {
- tickAndRender(currentNanoTime)
- }
- }.start()
-
- mainStage.show()
}
private fun prepareActionHandlers() {
- mainScene.onKeyPressed = EventHandler { event ->
- currentlyActiveKeys.add(event.code)
- }
- mainScene.onKeyReleased = EventHandler { event ->
- currentlyActiveKeys.remove(event.code)
- }
-
mainScene.onMouseClicked = EventHandler { event ->
if(event.y > 29) {
- if (event.x / 10 < gamePanel.size && (event.y - 30) / 10 < gamePanel[0].size && event.y >= 0) {
- gamePanel.getCells().born(gamePanel.getCells()[event.x.toInt() / 10][(event.y.toInt() - 30) / 10])
+ if (event.x / 10 < gamePanel.size && event.x >= 0 && (event.y - 30) / 10 < gamePanel[0].size && event.y >= 0) {
+ gamePanel.born(event.x.toInt() / 10, (event.y.toInt() - 30) / 10)
}
}
}
@@ -153,8 +140,8 @@ class Game : Application() {
mainScene.onMouseDragged = mainScene.onMouseClicked
}
- var counter : Int = 0
- var count : Int = 0
+ private var counter : Int = 0
+ private var count : Int = 0
private fun tickAndRender(currentNanoTime: Long) {
val elapsedNanos = currentNanoTime - lastFrameTime
lastFrameTime = currentNanoTime
diff --git a/src/main/kotlin/gui/GamePanel.kt b/src/main/kotlin/gui/GamePanel.kt
index f12f0f0430a2005b7f11b9a1f6a54e7aa2b9210b..ed9230b90c7779495a5ca4aa751be2b00ef1513d 100644
--- a/src/main/kotlin/gui/GamePanel.kt
+++ b/src/main/kotlin/gui/GamePanel.kt
@@ -4,17 +4,17 @@ import cell.Cell
import javafx.scene.canvas.Canvas
import logic.CellController
import logic.Order
+import javax.swing.tree.FixedHeightLayoutCache
-class GamePanel(height: Int, width: Int) : Canvas(width.toDouble(), height.toDouble()) {
+class GamePanel(width: Int, height: Int) : Canvas(width.toDouble(), height.toDouble()) {
private var order = Order("3", "23")
- private val cells: CellController = CellController(height, width, order)
+ private val cells: CellController = CellController(width, height, order)
val size: Int = cells.sizeInt
operator fun get(i: Int) : ArrayList<Cell> {return cells[i]}
- fun getCells(): CellController {return cells}
init {
cells.randomBegin()
}
@@ -24,7 +24,7 @@ class GamePanel(height: Int, width: Int) : Canvas(width.toDouble(), height.toDou
cells.makeKillings(pause)
}
- fun paint() {
+ private fun paint() {
for(i in cells.indices) {
for(j in cells[i].indices) {
cells[i][j].paint(this.graphicsContext2D)
@@ -32,7 +32,9 @@ class GamePanel(height: Int, width: Int) : Canvas(width.toDouble(), height.toDou
}
}
- public fun getCellController() : CellController { return cells }
+ fun born(x: Int, y: Int) {
+ cells.born(x, y)
+ }
fun setOrder(born: String, survive: String) {
cells.setOrder(born, survive)
diff --git a/src/main/kotlin/gui/MyFrame.kt b/src/main/kotlin/gui/MyFrame.kt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/main/kotlin/gui/MyMouseListener.kt b/src/main/kotlin/gui/MyMouseListener.kt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/main/kotlin/gui/MyMouseMotionListener.kt b/src/main/kotlin/gui/MyMouseMotionListener.kt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/main/kotlin/logic/Calculations.kt b/src/main/kotlin/logic/Calculations.kt
index 1eed4fd878e14f70940d0d91c3dbcf40d319e87e..0f446aac817a77ccdb849d6a36a39e6c83cf197d 100644
--- a/src/main/kotlin/logic/Calculations.kt
+++ b/src/main/kotlin/logic/Calculations.kt
@@ -2,7 +2,7 @@ package logic
public class Calculations {
companion object {
- public fun strSlice(str: String) : ArrayList<Int> {
+ fun strSlice(str: String) : ArrayList<Int> {
val arraylist = ArrayList<Int>()
for (i in str.indices) {
if(str[i] in '0'..'8')
diff --git a/src/main/kotlin/logic/CellController.kt b/src/main/kotlin/logic/CellController.kt
index 3e2c954afb1e9b2c376ec58ad5543ef2bf3cb9d4..8c922b2396f786a6dc6ba65ee84980d9fa112527 100644
--- a/src/main/kotlin/logic/CellController.kt
+++ b/src/main/kotlin/logic/CellController.kt
@@ -1,16 +1,14 @@
package logic
-import cell.AliveCell
-import cell.Cell
-import cell.CellArray
-import cell.DeadCell
+import cell.*
-class CellController(height: Int, width: Int, order: Order) {
- private val cells: CellArray = CellArray(height, width)
- val indices = cells.indices
+class CellController(width: Int, height: Int, order: Order) {
+ private val cells: CellArray = CellArray(width, height)
private val order: Order = Order(order)
- val size = cells.size()
- val sizeInt = cells.sizeInt()
+
+ val indices = cells.indices
+ val sizeInt = cells.size
+
fun setOrder(born: String, survive: String) {
order.setBorn(born)
order.setSurvive(survive)
@@ -106,46 +104,46 @@ class CellController(height: Int, width: Int, order: Order) {
}
private fun top(cell:Cell) : Cell {
- return cells[cell.getPositionX()][cell.getPositionY()-1]
+ return cells[cell.positionX][cell.positionY-1]
}
private fun topLeft(cell: Cell): Cell {
- return cells[cell.getPositionX()-1][cell.getPositionY()-1]
+ return cells[cell.positionX-1][cell.positionY-1]
}
private fun topRight(cell: Cell): Cell {
- return cells[cell.getPositionX()+1][cell.getPositionY()-1]
+ return cells[cell.positionX+1][cell.positionY-1]
}
private fun bottom(cell:Cell) : Cell {
- return cells[cell.getPositionX()][cell.getPositionY()+1]
+ return cells[cell.positionX][cell.positionY+1]
}
private fun bottomLeft(cell: Cell): Cell {
- return cells[cell.getPositionX()-1][cell.getPositionY()+1]
+ return cells[cell.positionX-1][cell.positionY+1]
}
private fun bottomRight(cell: Cell): Cell {
- return cells[cell.getPositionX()+1][cell.getPositionY()+1]
+ return cells[cell.positionX+1][cell.positionY+1]
}
private fun left(cell:Cell) : Cell {
- return cells[cell.getPositionX()-1][cell.getPositionY()]
+ return cells[cell.positionX-1][cell.positionY]
}
private fun right(cell:Cell) : Cell {
- return cells[cell.getPositionX()+1][cell.getPositionY()]
+ return cells[cell.positionX+1][cell.positionY]
}
private fun isOnTop(cell: Cell): Boolean {
- return cell.getPositionY() == 0
+ return cell.positionY == 0
}
private fun isOnBottom(cell: Cell): Boolean {
- return cell.getPositionY() == (cells[0].size - 1)
+ return cell.positionY == (cells[0].size - 1)
}
private fun isOnLeft(cell: Cell): Boolean {
- return cell.getPositionX() == 0
+ return cell.positionX == 0
}
private fun isOnRight(cell: Cell): Boolean {
- return cell.getPositionX() == (cells.cells.size - 1)
+ return cell.positionX == (cells.cells.size - 1)
}
fun randomBegin() {
@@ -158,14 +156,18 @@ class CellController(height: Int, width: Int, order: Order) {
}
private fun markCell(cell: Cell) {
- cells[cell.getPositionX()][cell.getPositionY()].setMark(true)
+ cells[cell.positionX][cell.positionY].setMark(true)
+ }
+
+ private fun born(cell: Cell) {
+ cells[cell.positionX][cell.positionY] = AliveCell(cell.position)
}
- fun born(cell: Cell) {
- cells[cell.getPositionX()][cell.getPositionY()] = AliveCell(cell.getPosition())
+ fun born(x: Int, y: Int) {
+ born(cells[x][y])
}
private fun kill(cell: Cell) {
- cells[cell.getPositionX()][cell.getPositionY()] = DeadCell(cell.getPosition())
+ cells[cell.positionX][cell.positionY] = DeadCell(cell.position)
}
}
\ No newline at end of file
diff --git a/src/main/kotlin/com/example/Main.kt b/src/main/kotlin/main/Main.kt
similarity index 80%
rename from src/main/kotlin/com/example/Main.kt
rename to src/main/kotlin/main/Main.kt
index 646288e1809acb33878d04da6602ee2c037d46e9..c9bd3ae2a2d068a09f33963df8064c3bfec136a5 100644
--- a/src/main/kotlin/com/example/Main.kt
+++ b/src/main/kotlin/main/Main.kt
@@ -1,5 +1,6 @@
-package com.example
+package main
+import gui.Game
import javafx.application.Application
fun main(args: Array<String>) {
diff --git a/src/main/resources/space.png b/src/main/resources/space.png
deleted file mode 100644
index 9f4821ac80932eb4cbc99498692aaacddde14f3f..0000000000000000000000000000000000000000
Binary files a/src/main/resources/space.png and /dev/null differ
diff --git a/src/main/resources/sun.png b/src/main/resources/sun.png
deleted file mode 100644
index 8d08965346e0ea86af7b7f6b5a72572bb0d2508e..0000000000000000000000000000000000000000
Binary files a/src/main/resources/sun.png and /dev/null differ