From df051ceb0efee730996f993b301258cd820c3c69 Mon Sep 17 00:00:00 2001
From: levtus <i@alexander.systems>
Date: Wed, 18 Oct 2023 19:09:34 -0500
Subject: [PATCH] Yellow & Kelp floor chair fixes

---
 .idea/workspace.xml                           | 80 +++++--------------
 .../blockstates/kelp_floor_chair.json         | 64 +++++++++++++++
 .../blockstates/yellow_floor_chair.json       | 32 ++++----
 .../models/item/kelp_floor_chair.json         |  2 +-
 4 files changed, 101 insertions(+), 77 deletions(-)
 create mode 100644 src/main/resources/assets/interiors/blockstates/kelp_floor_chair.json

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ebe6b6d2..00d7663f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,50 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="29b234e3-d36d-458e-b861-e1d0a81a3453" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/run/logs/2023-10-18-6.log.gz" afterDir="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/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock" 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$/.gradle/workspace-id.txt.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/workspace-id.txt.lock" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/assets/interiors/blockstates/kelp_floor_chair.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/config/forge-client.toml" beforeDir="false" afterPath="$PROJECT_DIR$/run/config/forge-client.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/config/forge-common.toml" beforeDir="false" afterPath="$PROJECT_DIR$/run/config/forge-common.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/2023-10-18-1.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/2023-10-18-1.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/2023-10-18-2.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/2023-10-18-2.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/2023-10-18-3.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/2023-10-18-3.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/2023-10-18-4.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/2023-10-18-4.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/2023-10-18-5.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/2023-10-18-5.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/debug-1.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/debug-1.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/debug-2.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/debug-2.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/debug-3.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/debug-3.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/debug-4.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/debug-4.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/debug-5.log.gz" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/debug-5.log.gz" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/debug.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/logs/latest.log" beforeDir="false" afterPath="$PROJECT_DIR$/run/logs/latest.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/DIM-1/data/raids.dat" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/DIM-1/data/raids.dat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/DIM1/data/raids_end.dat" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/DIM1/data/raids_end.dat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/data/raids.dat" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/data/raids.dat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/entities/r.-1.-1.mca" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/entities/r.-1.-1.mca" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/entities/r.-1.0.mca" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/entities/r.-1.0.mca" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/entities/r.0.-1.mca" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/entities/r.0.-1.mca" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/entities/r.0.0.mca" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/entities/r.0.0.mca" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/level.dat" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/level.dat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/level.dat_old" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/level.dat_old" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/playerdata/380df991-f603-344c-a090-369bad2a924a.dat" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/playerdata/380df991-f603-344c-a090-369bad2a924a.dat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/playerdata/380df991-f603-344c-a090-369bad2a924a.dat_old" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/playerdata/380df991-f603-344c-a090-369bad2a924a.dat_old" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/region/r.-1.-1.mca" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/region/r.-1.-1.mca" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/region/r.-1.0.mca" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/region/r.-1.0.mca" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/region/r.0.-1.mca" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/region/r.0.-1.mca" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/region/r.0.0.mca" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/region/r.0.0.mca" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/serverconfig/create-server.toml" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/serverconfig/create-server.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/serverconfig/forge-server.toml" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/serverconfig/forge-server.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/saves/New World/stats/380df991-f603-344c-a090-369bad2a924a.json" beforeDir="false" afterPath="$PROJECT_DIR$/run/saves/New World/stats/380df991-f603-344c-a090-369bad2a924a.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/run/usercache.json" beforeDir="false" afterPath="$PROJECT_DIR$/run/usercache.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/assets/interiors/blockstates/yellow_floor_chair.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/assets/interiors/blockstates/yellow_floor_chair.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/assets/interiors/models/item/kelp_floor_chair.json" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/assets/interiors/models/item/kelp_floor_chair.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -109,28 +69,28 @@
   <component name="ProjectViewState">
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;1.18.2&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/GitRepos/CreateInteriorsMod-1.19.2/src/main/resources/data/interiors/loot_tables/blocks&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "1.18.2",
+    "ignore.virus.scanning.warn.message": "true",
+    "last_opened_file_path": "C:/GitRepos/CreateInteriorsMod-1.19.2/src/main/resources/assets/interiors/blockstates",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\GitRepos\CreateInteriorsMod-1.19.2\src\main\resources\assets\interiors\blockstates" />
       <recent name="C:\GitRepos\CreateInteriorsMod-1.19.2\src\main\resources\data\interiors\loot_tables\blocks" />
       <recent name="C:\GitRepos\CreateInteriorsMod-1.19.2\src\main\resources\assets\interiors\models\item" />
-      <recent name="C:\GitRepos\CreateInteriorsMod-1.19.2\src\main\resources\assets\interiors\blockstates" />
       <recent name="C:\GitRepos\CreateInteriorsMod-1.19.2" />
       <recent name="C:\GitRepos\CreateInteriorsMod-1.19.2\src\main\resources\assets\interiors\lang" />
     </key>
diff --git a/src/main/resources/assets/interiors/blockstates/kelp_floor_chair.json b/src/main/resources/assets/interiors/blockstates/kelp_floor_chair.json
new file mode 100644
index 00000000..dc6b6f43
--- /dev/null
+++ b/src/main/resources/assets/interiors/blockstates/kelp_floor_chair.json
@@ -0,0 +1,64 @@
+{
+  "variants": {
+    "facing=east,armrests=none": {
+      "model": "interiors:block/kelp_floor_chair",
+      "y": 90
+    },
+    "facing=north,armrests=none": {
+      "model": "interiors:block/kelp_floor_chair"
+    },
+    "facing=south,armrests=none": {
+      "model": "interiors:block/kelp_floor_chair",
+      "y": 180
+    },
+    "facing=west,armrests=none": {
+      "model": "interiors:block/kelp_floor_chair",
+      "y": 270
+    },
+    "facing=east,armrests=left": {
+      "model": "interiors:block/kelp_floor_chair_left",
+      "y": 90
+    },
+    "facing=north,armrests=left": {
+      "model": "interiors:block/kelp_floor_chair_left"
+    },
+    "facing=south,armrests=left": {
+      "model": "interiors:block/kelp_floor_chair_left",
+      "y": 180
+    },
+    "facing=west,armrests=left": {
+      "model": "interiors:block/kelp_floor_chair_left",
+      "y": 270
+    },
+    "facing=east,armrests=right": {
+      "model": "interiors:block/kelp_floor_chair_right",
+      "y": 90
+    },
+    "facing=north,armrests=right": {
+      "model": "interiors:block/kelp_floor_chair_right"
+    },
+    "facing=south,armrests=right": {
+      "model": "interiors:block/kelp_floor_chair_right",
+      "y": 180
+    },
+    "facing=west,armrests=right": {
+      "model": "interiors:block/kelp_floor_chair_right",
+      "y": 270
+    },
+    "facing=east,armrests=both": {
+      "model": "interiors:block/kelp_floor_chair_both",
+      "y": 90
+    },
+    "facing=north,armrests=both": {
+      "model": "interiors:block/kelp_floor_chair_both"
+    },
+    "facing=south,armrests=both": {
+      "model": "interiors:block/kelp_floor_chair_both",
+      "y": 180
+    },
+    "facing=west,armrests=both": {
+      "model": "interiors:block/kelp_floor_chair_both",
+      "y": 270
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/interiors/blockstates/yellow_floor_chair.json b/src/main/resources/assets/interiors/blockstates/yellow_floor_chair.json
index cf00ed93..5c21a8e4 100644
--- a/src/main/resources/assets/interiors/blockstates/yellow_floor_chair.json
+++ b/src/main/resources/assets/interiors/blockstates/yellow_floor_chair.json
@@ -1,63 +1,63 @@
 {
   "variants": {
     "facing=east,armrests=none": {
-      "model": "interiors:block/floor_chair/yelfloor_chair",
+      "model": "interiors:block/floor_chair/yellow_chair",
       "y": 90
     },
     "facing=north,armrests=none": {
-      "model": "interiors:block/floor_chair/yelfloor_chair"
+      "model": "interiors:block/floor_chair/yellow_chair"
     },
     "facing=south,armrests=none": {
-      "model": "interiors:block/floor_chair/yelfloor_chair",
+      "model": "interiors:block/floor_chair/yellow_chair",
       "y": 180
     },
     "facing=west,armrests=none": {
-      "model": "interiors:block/floor_chair/yelfloor_chair",
+      "model": "interiors:block/floor_chair/yellow_chair",
       "y": 270
     },
     "facing=east,armrests=left": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_left",
+      "model": "interiors:block/floor_chair/yellow_chair_left",
       "y": 90
     },
     "facing=north,armrests=left": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_left"
+      "model": "interiors:block/floor_chair/yellow_chair_left"
     },
     "facing=south,armrests=left": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_left",
+      "model": "interiors:block/floor_chair/yellow_chair_left",
       "y": 180
     },
     "facing=west,armrests=left": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_left",
+      "model": "interiors:block/floor_chair/yellow_chair_left",
       "y": 270
     },
     "facing=east,armrests=right": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_right",
+      "model": "interiors:block/floor_chair/yellow_chair_right",
       "y": 90
     },
     "facing=north,armrests=right": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_right"
+      "model": "interiors:block/floor_chair/yellow_chair_right"
     },
     "facing=south,armrests=right": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_right",
+      "model": "interiors:block/floor_chair/yellow_chair_right",
       "y": 180
     },
     "facing=west,armrests=right": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_right",
+      "model": "interiors:block/floor_chair/yellow_chair_right",
       "y": 270
     },
     "facing=east,armrests=both": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_both",
+      "model": "interiors:block/floor_chair/yellow_chair_both",
       "y": 90
     },
     "facing=north,armrests=both": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_both"
+      "model": "interiors:block/floor_chair/yellow_chair_both"
     },
     "facing=south,armrests=both": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_both",
+      "model": "interiors:block/floor_chair/yellow_chair_both",
       "y": 180
     },
     "facing=west,armrests=both": {
-      "model": "interiors:block/floor_chair/yelfloor_chair_both",
+      "model": "interiors:block/floor_chair/yellow_chair_both",
       "y": 270
     }
   }
diff --git a/src/main/resources/assets/interiors/models/item/kelp_floor_chair.json b/src/main/resources/assets/interiors/models/item/kelp_floor_chair.json
index a11415f6..e0a946fd 100644
--- a/src/main/resources/assets/interiors/models/item/kelp_floor_chair.json
+++ b/src/main/resources/assets/interiors/models/item/kelp_floor_chair.json
@@ -1,3 +1,3 @@
 {
-  "parent": "interiors:block/kelp_chair"
+  "parent": "interiors:block/kelp_floor_chair"
 }