Bugsquashing

aesefficio · Oct 18, 2023 · b2e254f · b2e254f
1 parent 6a7cb5a
commit b2e254f
Show file tree

Hide file tree

Showing 139 changed files with 6,185 additions and 4,394 deletions.
diff --git a/.gradle/7.5.1/checksums/checksums.lock b/.gradle/7.5.1/checksums/checksums.lock
diff --git a/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.5.1/dependencies-accessors/dependencies-accessors.lock
diff --git a/.gradle/7.5.1/executionHistory/executionHistory.bin b/.gradle/7.5.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.5.1/executionHistory/executionHistory.lock b/.gradle/7.5.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.5.1/fileHashes/fileHashes.bin b/.gradle/7.5.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.5.1/fileHashes/fileHashes.lock b/.gradle/7.5.1/fileHashes/fileHashes.lock
diff --git a/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/.gradle/7.5.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/.gradle/workspace-id.txt.lock b/.gradle/workspace-id.txt.lock
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build/classes/java/main/systems/alexander/interiors/AllTags.class b/build/classes/java/main/systems/alexander/interiors/AllTags.class
diff --git a/build/classes/java/main/systems/alexander/interiors/BigSeatEntity$Render.class b/build/classes/java/main/systems/alexander/interiors/BigSeatEntity$Render.class
diff --git a/build/classes/java/main/systems/alexander/interiors/BigSeatEntity.class b/build/classes/java/main/systems/alexander/interiors/BigSeatEntity.class
diff --git a/build/classes/java/main/systems/alexander/interiors/Interiors$ClientModEvents.class b/build/classes/java/main/systems/alexander/interiors/Interiors$ClientModEvents.class
diff --git a/build/classes/java/main/systems/alexander/interiors/Interiors.class b/build/classes/java/main/systems/alexander/interiors/Interiors.class
diff --git a/build/classes/java/main/systems/alexander/interiors/block/ModBlocks.class b/build/classes/java/main/systems/alexander/interiors/block/ModBlocks.class
diff --git a/...sses/java/main/systems/alexander/interiors/block/custom/BigSeatInteractionBehaviour.class b/...sses/java/main/systems/alexander/interiors/block/custom/BigSeatInteractionBehaviour.class
diff --git a/...classes/java/main/systems/alexander/interiors/block/custom/BigSeatMovementBehaviour.class b/...classes/java/main/systems/alexander/interiors/block/custom/BigSeatMovementBehaviour.class
diff --git a/.../classes/java/main/systems/alexander/interiors/block/custom/ChairBlockExtendsSeat$1.class b/.../classes/java/main/systems/alexander/interiors/block/custom/ChairBlockExtendsSeat$1.class
diff --git a/...ystems/alexander/interiors/block/custom/ChairBlockExtendsSeat$ArmrestConfigurations.class b/...ystems/alexander/interiors/block/custom/ChairBlockExtendsSeat$ArmrestConfigurations.class
diff --git a/build/classes/java/main/systems/alexander/interiors/block/custom/ChairBlockExtendsSeat.class b/build/classes/java/main/systems/alexander/interiors/block/custom/ChairBlockExtendsSeat.class
diff --git a/build/classes/java/main/systems/alexander/interiors/block/custom/DirectionalSeatBlock.class b/build/classes/java/main/systems/alexander/interiors/block/custom/DirectionalSeatBlock.class
diff --git a/build/classes/java/main/systems/alexander/interiors/block/util/EntityTypes.class b/build/classes/java/main/systems/alexander/interiors/block/util/EntityTypes.class
diff --git a/build/classes/java/main/systems/alexander/interiors/block/util/ModTags$Blocks.class b/build/classes/java/main/systems/alexander/interiors/block/util/ModTags$Blocks.class
diff --git a/build/classes/java/main/systems/alexander/interiors/block/util/ModTags$Items.class b/build/classes/java/main/systems/alexander/interiors/block/util/ModTags$Items.class
diff --git a/build/classes/java/main/systems/alexander/interiors/block/util/ModTags.class b/build/classes/java/main/systems/alexander/interiors/block/util/ModTags.class
diff --git a/build/classes/java/main/systems/alexander/interiors/item/CreativeTabStuff.class b/build/classes/java/main/systems/alexander/interiors/item/CreativeTabStuff.class
diff --git a/build/classes/java/main/systems/alexander/interiors/item/ModCreativeModeTabs.class b/build/classes/java/main/systems/alexander/interiors/item/ModCreativeModeTabs.class
diff --git a/build/classes/java/main/systems/alexander/interiors/item/ModItems.class b/build/classes/java/main/systems/alexander/interiors/item/ModItems.class
diff --git a/build/resources/main/META-INF/mods.toml b/build/resources/main/META-INF/mods.toml
@@ -2,15 +2,15 @@ modLoader="javafml" #mandatory
 loaderVersion="[43,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 license="MIT"
 # A URL to refer people to when problems occur with this mod
-issueTrackerURL = "https://github.com/alexandsr/CreateInteriorsMod/issues"
+issueTrackerURL = "https://github.com/sudolev/CreateInteriorsMod/issues"
 [[mods]] #mandatory
 # The modid of the mod
 modId="interiors" #mandatory
-version = "0.3.1" #mandatory
+version = "0.4" #mandatory
 displayName="Create: Interiors" #mandatory
-displayURL = "https://alexandsr.github.io/CreateInteriorsMod/"
+displayURL = "https://sudolev.github.io/CreateInteriorsMod/"
 # A file name (in the root of the mod JAR) containing a logo for display
-authors = "Alexander Weimer" #optional
+authors = "sudolev" #optional
 
 # The description text for the mod (multi line!) (#mandatory)
 description='''

diff --git a/build/resources/main/assets/interiors/blockstates/red_chair_icon.json b/build/resources/main/assets/interiors/blockstates/red_chair_icon.json
@@ -1,64 +1,7 @@
 {
   "variants": {
-    "facing=east,armrests=none": {
-      "model": "interiors:block/chair/red_chair",
-      "y": 90
-    },
-    "facing=north,armrests=none": {
+    "": {
       "model": "interiors:block/chair/red_chair"
-    },
-    "facing=south,armrests=none": {
-      "model": "interiors:block/chair/red_chair",
-      "y": 180
-    },
-    "facing=west,armrests=none": {
-      "model": "interiors:block/chair/red_chair",
-      "y": 270
-    },
-    "facing=east,armrests=left": {
-      "model": "interiors:block/chair/red_chair_left",
-      "y": 90
-    },
-    "facing=north,armrests=left": {
-      "model": "interiors:block/chair/red_chair_left"
-    },
-    "facing=south,armrests=left": {
-      "model": "interiors:block/chair/red_chair_left",
-      "y": 180
-    },
-    "facing=west,armrests=left": {
-      "model": "interiors:block/chair/red_chair_left",
-      "y": 270
-    },
-    "facing=east,armrests=right": {
-      "model": "interiors:block/chair/red_chair_right",
-      "y": 90
-    },
-    "facing=north,armrests=right": {
-      "model": "interiors:block/chair/red_chair_right"
-    },
-    "facing=south,armrests=right": {
-      "model": "interiors:block/chair/red_chair_right",
-      "y": 180
-    },
-    "facing=west,armrests=right": {
-      "model": "interiors:block/chair/red_chair_right",
-      "y": 270
-    },
-    "facing=east,armrests=both": {
-      "model": "interiors:block/chair/red_chair_both",
-      "y": 90
-    },
-    "facing=north,armrests=both": {
-      "model": "interiors:block/chair/red_chair_both"
-    },
-    "facing=south,armrests=both": {
-      "model": "interiors:block/chair/red_chair_both",
-      "y": 180
-    },
-    "facing=west,armrests=both": {
-      "model": "interiors:block/chair/red_chair_both",
-      "y": 270
     }
   }
 }
diff --git a/build/resources/main/assets/interiors/blockstates/yellow_chair.json b/build/resources/main/assets/interiors/blockstates/yellow_chair.json
@@ -1,63 +1,63 @@
 {
   "variants": {
     "facing=east,armrests=none": {
-      "model": "interiors:block/chair/yellow_chair",
+      "model": "interiors:block/chair/yelfloor_chair",
       "y": 90
     },
     "facing=north,armrests=none": {
-      "model": "interiors:block/chair/yellow_chair"
+      "model": "interiors:block/chair/yelfloor_chair"
     },
     "facing=south,armrests=none": {
-      "model": "interiors:block/chair/yellow_chair",
+      "model": "interiors:block/chair/yelfloor_chair",
       "y": 180
     },
     "facing=west,armrests=none": {
-      "model": "interiors:block/chair/yellow_chair",
+      "model": "interiors:block/chair/yelfloor_chair",
       "y": 270
     },
     "facing=east,armrests=left": {
-      "model": "interiors:block/chair/yellow_chair_left",
+      "model": "interiors:block/chair/yelfloor_chair_left",
       "y": 90
     },
     "facing=north,armrests=left": {
-      "model": "interiors:block/chair/yellow_chair_left"
+      "model": "interiors:block/chair/yelfloor_chair_left"
     },
     "facing=south,armrests=left": {
-      "model": "interiors:block/chair/yellow_chair_left",
+      "model": "interiors:block/chair/yelfloor_chair_left",
       "y": 180
     },
     "facing=west,armrests=left": {
-      "model": "interiors:block/chair/yellow_chair_left",
+      "model": "interiors:block/chair/yelfloor_chair_left",
       "y": 270
     },
     "facing=east,armrests=right": {
-      "model": "interiors:block/chair/yellow_chair_right",
+      "model": "interiors:block/chair/yelfloor_chair_right",
       "y": 90
     },
     "facing=north,armrests=right": {
-      "model": "interiors:block/chair/yellow_chair_right"
+      "model": "interiors:block/chair/yelfloor_chair_right"
     },
     "facing=south,armrests=right": {
-      "model": "interiors:block/chair/yellow_chair_right",
+      "model": "interiors:block/chair/yelfloor_chair_right",
       "y": 180
     },
     "facing=west,armrests=right": {
-      "model": "interiors:block/chair/yellow_chair_right",
+      "model": "interiors:block/chair/yelfloor_chair_right",
       "y": 270
     },
     "facing=east,armrests=both": {
-      "model": "interiors:block/chair/yellow_chair_both",
+      "model": "interiors:block/chair/yelfloor_chair_both",
       "y": 90
     },
     "facing=north,armrests=both": {
-      "model": "interiors:block/chair/yellow_chair_both"
+      "model": "interiors:block/chair/yelfloor_chair_both"
     },
     "facing=south,armrests=both": {
-      "model": "interiors:block/chair/yellow_chair_both",
+      "model": "interiors:block/chair/yelfloor_chair_both",
       "y": 180
     },
     "facing=west,armrests=both": {
-      "model": "interiors:block/chair/yellow_chair_both",
+      "model": "interiors:block/chair/yelfloor_chair_both",
       "y": 270
     }
   }

diff --git a/build/resources/main/assets/interiors/lang/de_de.json b/build/resources/main/assets/interiors/lang/de_de.json
@@ -29,6 +29,23 @@
   "block.interiors.chair.tooltip.condition2": "Use Wrench on stuhl",
   "block.interiors.chair.tooltip.behaviour2": "Cycles _Chair_ armrest configurations.",
   "block.interiors.seatwood_planks.tooltip": "SEATWOOD_PLANKS",
-  "block.interiors.seatwood_planks.tooltip.summary": "Not a very useful block on its own, but useful together with _Copycat_ blocks."
+  "block.interiors.seatwood_planks.tooltip.summary": "Not a very useful block on its own, but useful together with _Copycat_ blocks.",
+  "block.interiors.kelp_floor_chair": "Kelp Low Chair",
+  "block.interiors.white_floor_chair": "White Low Chair",
+  "block.interiors.light_gray_floor_chair": "Light Gray Low Chair",
+  "block.interiors.gray_floor_chair": "Gray Low Chair",
+  "block.interiors.black_floor_chair": "Black Low Chair",
+  "block.interiors.brown_floor_chair": "Brown Low Chair",
+  "block.interiors.red_floor_chair": "Red Low Chair",
+  "block.interiors.orange_floor_chair": "Orange Low Chair",
+  "block.interiors.yellow_floor_chair": "Yellow Low Chair",
+  "block.interiors.lime_floor_chair": "Lime Low Chair",
+  "block.interiors.green_floor_chair": "Green Low Chair",
+  "block.interiors.cyan_floor_chair": "Cyan Low Chair",
+  "block.interiors.light_blue_floor_chair": "Light Blue Low Chair",
+  "block.interiors.blue_floor_chair": "Blue Low Chair",
+  "block.interiors.purple_floor_chair": "Purple Low Chair",
+  "block.interiors.magenta_floor_chair": "Magenta Low Chair",
+  "block.interiors.pink_floor_chair": "Pink Low Chair"
 
 }
diff --git a/build/resources/main/assets/interiors/lang/en_us.json b/build/resources/main/assets/interiors/lang/en_us.json
@@ -5,6 +5,8 @@
 
   "block.interiors.kelp_seat": "Kelp Seat",
   "block.interiors.kelp_chair": "Kelp Chair",
+  "block.interiors.kelp_floor_chair": "Kelp Low Chair",
+
   "block.interiors.seatwood_planks": "Seatwood Planks",
 
   "block.interiors.white_chair": "White Chair",
@@ -23,6 +25,22 @@
   "block.interiors.purple_chair": "Purple Chair",
   "block.interiors.magenta_chair": "Magenta Chair",
   "block.interiors.pink_chair": "Pink Chair",
+  "block.interiors.white_floor_chair": "White Low Chair",
+  "block.interiors.light_gray_floor_chair": "Light Gray Low Chair",
+  "block.interiors.gray_floor_chair": "Gray Low Chair",
+  "block.interiors.black_floor_chair": "Black Low Chair",
+  "block.interiors.brown_floor_chair": "Brown Low Chair",
+  "block.interiors.red_floor_chair": "Red Low Chair",
+  "block.interiors.orange_floor_chair": "Orange Low Chair",
+  "block.interiors.yellow_floor_chair": "Yellow Low Chair",
+  "block.interiors.lime_floor_chair": "Lime Low Chair",
+  "block.interiors.green_floor_chair": "Green Low Chair",
+  "block.interiors.cyan_floor_chair": "Cyan Low Chair",
+  "block.interiors.light_blue_floor_chair": "Light Blue Low Chair",
+  "block.interiors.blue_floor_chair": "Blue Low Chair",
+  "block.interiors.purple_floor_chair": "Purple Low Chair",
+  "block.interiors.magenta_floor_chair": "Magenta Low Chair",
+  "block.interiors.pink_floor_chair": "Pink Low Chair",
 
   "block.interiors.chair.tooltip": "CHAIR",
   "block.interiors.chair.tooltip.summary": "Sit yourself down and enjoy the ride just a little more! Will anchor a player onto a moving _contraption_. An appealing option for static furniture too! Comes in a variety of colours.",

diff --git a/build/resources/main/assets/interiors/lang/ko_kr.json b/build/resources/main/assets/interiors/lang/ko_kr.json
@@ -5,6 +5,8 @@
 
   "block.interiors.kelp_seat": "켈프 좌석",
   "block.interiors.kelp_chair": "켈프 의자",
+  "block.interiors.kelp_floor_chair": "켈프 좌식 의자",
+
   "block.interiors.seatwood_planks": "좌석목재 판자",
 
   "block.interiors.white_chair": "하얀색 의자",
@@ -14,7 +16,7 @@
   "block.interiors.brown_chair": "갈색 의자",
   "block.interiors.red_chair": "빨간색 의자",
   "block.interiors.orange_chair": "주황색 의자",
-  "block.interiors.yellow_chair": "노란색 의자",
+  "block.interiors.yelfloor_chair": "노란색 의자",
   "block.interiors.lime_chair": "연두색 의자",
   "block.interiors.green_chair": "초록색 의자",
   "block.interiors.cyan_chair": "청록색 의자",
@@ -23,6 +25,22 @@
   "block.interiors.purple_chair": "보라색 의자",
   "block.interiors.magenta_chair": "자홍색 의자",
   "block.interiors.pink_chair": "분홍색 의자",
+  "block.interiors.white_floor_chair": "하얀색 좌식 의자",
+  "block.interiors.light_gray_floor_chair": "회백색 좌식 의자",
+  "block.interiors.gray_floor_chair": "회색 좌식 의자",
+  "block.interiors.black_floor_chair": "검은색 좌식 의자",
+  "block.interiors.brown_floor_chair": "갈색 좌식 의자",
+  "block.interiors.red_floor_chair": "빨간색 좌식 의자",
+  "block.interiors.orange_floor_chair": "주황색 좌식 의자",
+  "block.interiors.yellow_floor_chair": "노란색 좌식 의자",
+  "block.interiors.lime_floor_chair": "연두색 좌식 의자",
+  "block.interiors.green_floor_chair": "초록색 좌식 의자",
+  "block.interiors.cyan_floor_chair": "청록색 좌식 의자",
+  "block.interiors.light_blue_floor_chair": "하늘색 좌식 의자",
+  "block.interiors.blue_floor_chair": "파란색 좌식 의자",
+  "block.interiors.purple_floor_chair": "보라색 좌식 의자",
+  "block.interiors.magenta_floor_chair": "자홍색 좌식 의자",
+  "block.interiors.pink_floor_chair": "분홍색 좌식 의자",
 
   "block.interiors.chair.tooltip": "의자",
   "block.interiors.chair.tooltip.summary": "앉아서 타는 탈 것을 조금 더 즐겨보세요! 플레이어를 움직이는 _구조물_에 고정시킵니다. 일반 가구로서도 매력적인 옵션입니다! 다양한 색상으로 만나보세요.",

diff --git a/build/resources/main/assets/interiors/models/block/chair/black_chair.json b/build/resources/main/assets/interiors/models/block/chair/black_chair.json
@@ -33,9 +33,25 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
 				"north": {"uv": [0, 11, 16, 16], "texture": "#0"},
-				"east": {"uv": [0, 3, 8, 8], "texture": "#5"},
+				"east": {
+					"uv": [
+						0,
+						3,
+						8,
+						8
+					],
+					"texture": "#5"
+				},
 				"south": {"uv": [0, 11, 16, 16], "texture": "#0"},
-				"west": {"uv": [0, 3, 8, 8], "texture": "#5"},
+				"west": {
+					"uv": [
+						0,
+						3,
+						8,
+						8
+					],
+					"texture": "#5"
+				},
 				"up": {"uv": [6, 15, 7, 16], "rotation": 270, "texture": "#7"},
 				"down": {"uv": [4, 0, 12, 16], "rotation": 90, "texture": "#0"}
 			}

diff --git a/build/resources/main/assets/interiors/models/block/chair/black_chair_both.json b/build/resources/main/assets/interiors/models/block/chair/black_chair_both.json
@@ -33,9 +33,25 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
 				"north": {"uv": [0, 11, 16, 16], "texture": "#0"},
-				"east": {"uv": [0, 3, 8, 8], "texture": "#5"},
+              "east": {
+                "uv": [
+                  0,
+                  3,
+                  8,
+                  8
+                ],
+                "texture": "#5"
+              },
 				"south": {"uv": [0, 11, 16, 16], "texture": "#0"},
-				"west": {"uv": [0, 3, 8, 8], "texture": "#5"},
+              "west": {
+                "uv": [
+                  0,
+                  3,
+                  8,
+                  8
+                ],
+                "texture": "#5"
+              },
 				"up": {"uv": [6, 15, 7, 16], "rotation": 270, "texture": "#7"},
 				"down": {"uv": [4, 0, 12, 16], "rotation": 90, "texture": "#0"}
 			}

diff --git a/build/resources/main/assets/interiors/models/block/chair/black_chair_left.json b/build/resources/main/assets/interiors/models/block/chair/black_chair_left.json
@@ -33,9 +33,25 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
 				"north": {"uv": [0, 11, 16, 16], "texture": "#0"},
-				"east": {"uv": [0, 3, 8, 8], "texture": "#5"},
+              "east": {
+                "uv": [
+                  0,
+                  3,
+                  8,
+                  8
+                ],
+                "texture": "#5"
+              },
 				"south": {"uv": [0, 11, 16, 16], "texture": "#0"},
-				"west": {"uv": [0, 3, 8, 8], "texture": "#5"},
+              "west": {
+                "uv": [
+                  0,
+                  3,
+                  8,
+                  8
+                ],
+                "texture": "#5"
+              },
 				"up": {"uv": [6, 15, 7, 16], "rotation": 270, "texture": "#7"},
 				"down": {"uv": [4, 0, 12, 16], "rotation": 90, "texture": "#0"}
 			}

diff --git a/build/resources/main/assets/interiors/models/block/chair/black_chair_right.json b/build/resources/main/assets/interiors/models/block/chair/black_chair_right.json
@@ -33,9 +33,25 @@
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
 				"north": {"uv": [0, 11, 16, 16], "texture": "#0"},
-				"east": {"uv": [0, 3, 8, 8], "texture": "#5"},
+				"east": {
+					"uv": [
+						0,
+						3,
+						8,
+						8
+					],
+					"texture": "#5"
+				},
 				"south": {"uv": [0, 11, 16, 16], "texture": "#0"},
-				"west": {"uv": [0, 3, 8, 8], "texture": "#5"},
+				"west": {
+					"uv": [
+						0,
+						3,
+						8,
+						8
+					],
+					"texture": "#5"
+				},
 				"up": {"uv": [6, 15, 7, 16], "rotation": 270, "texture": "#7"},
 				"down": {"uv": [4, 0, 12, 16], "rotation": 90, "texture": "#0"}
 			}