various changes

- cropped floor chair texture mapping - actually good shift-wrench use
aesefficio · Oct 24, 2023 · 0458d56 · 0458d56
1 parent 162af11
commit 0458d56
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ build
 .gradle
 run
 .DS_Store
+src/main/resources/assets/create
diff --git a/src/main/java/com/sudolev/interiors/content/block/seat/ChairBlock.java b/src/main/java/com/sudolev/interiors/content/block/seat/ChairBlock.java
@@ -97,23 +97,14 @@ public void updateEntityAfterFallOn(BlockGetter reader, Entity entity) {
 	public InteractionResult onWrenched(BlockState state, UseOnContext context) {
 		Level world = context.getLevel();
 		BlockPos pos = context.getClickedPos();
-		Direction face = context.getClickedFace();
 
 		Vec3 clickPos = pos.getCenter().subtract(context.getClickLocation());
 
 		state = switch(state.getValue(FACING)) {
-			case NORTH ->
-				face == Direction.SOUTH ? toggleBackCrop(state) :
-				(clickPos.x > 0 ? toggleLeft(state) : toggleRight(state));
-			case SOUTH ->
-				face == Direction.NORTH ? toggleBackCrop(state) :
-					clickPos.x < 0 ? toggleLeft(state) : toggleRight(state);
-			case WEST ->
-				face == Direction.EAST ? toggleBackCrop(state) :
-					clickPos.z < 0 ? toggleLeft(state) : toggleRight(state);
-			case EAST ->
-				face == Direction.WEST ? toggleBackCrop(state) :
-					clickPos.z > 0 ? toggleLeft(state) : toggleRight(state);
+			case NORTH -> clickPos.x > 0 ? toggleLeft(state) : toggleRight(state);
+			case SOUTH -> clickPos.x < 0 ? toggleLeft(state) : toggleRight(state);
+			case WEST -> clickPos.z < 0 ? toggleLeft(state) : toggleRight(state);
+			case EAST -> clickPos.z > 0 ? toggleLeft(state) : toggleRight(state);
 			default -> state;
 		};
 
@@ -153,10 +144,7 @@ public InteractionResult onSneakWrenched(BlockState state, UseOnContext context)
 		BlockPos pos = context.getClickedPos();
 
 		if(!world.isClientSide) {
-			world.setBlock(pos, state.setValue(ARMRESTS, switch(state.getValue(ARMRESTS)) {
-				case BOTH, LEFT, RIGHT -> NONE;
-				case NONE -> BOTH;
-			}), 3);
+			world.setBlock(pos, toggleBackCrop(state), 3);
 		}
 
 		return InteractionResult.SUCCESS;

diff --git a/src/main/resources/assets/interiors/models/block/floor_chair/both_cropped.json b/src/main/resources/assets/interiors/models/block/floor_chair/both_cropped.json
@@ -63,7 +63,7 @@
 				"east": {"uv": [0, 5, 16, 0], "rotation": 270, "texture": "#side_top"},
 				"south": {"uv": [0, 16, 16, 0], "texture": "#side_top"},
 				"west": {"uv": [0, 5, 16, 0], "rotation": 90, "texture": "#side_top"},
-				"up": {"uv": [0, 8, 16, 13], "texture": "#top"},
+				"up": {"uv": [0, 8, 16, 13], "texture": "#side_top"},
 				"down": {"uv": [0, 0, 16, 8], "texture": "#missing"}
 			}
 		},

diff --git a/src/main/resources/assets/interiors/models/block/floor_chair/left_cropped.json b/src/main/resources/assets/interiors/models/block/floor_chair/left_cropped.json
@@ -49,7 +49,7 @@
 				"east": {"uv": [0, 5, 16, 0], "rotation": 270, "texture": "#side_top"},
 				"south": {"uv": [0, 16, 16, 0], "texture": "#side_top"},
 				"west": {"uv": [0, 5, 16, 0], "rotation": 90, "texture": "#side_top"},
-				"up": {"uv": [0, 8, 16, 13], "texture": "#top"},
+				"up": {"uv": [0, 8, 16, 13], "texture": "#side_top"},
 				"down": {"uv": [0, 0, 16, 8], "texture": "#missing"}
 			}
 		},

diff --git a/src/main/resources/assets/interiors/models/block/floor_chair/none_cropped.json b/src/main/resources/assets/interiors/models/block/floor_chair/none_cropped.json
@@ -35,7 +35,7 @@
 				"east": {"uv": [0, 5, 16, 0], "rotation": 270, "texture": "#side_top"},
 				"south": {"uv": [0, 16, 16, 0], "texture": "#side_top"},
 				"west": {"uv": [0, 5, 16, 0], "rotation": 90, "texture": "#side_top"},
-				"up": {"uv": [0, 8, 16, 13], "texture": "#top"},
+				"up": {"uv": [0, 8, 16, 13], "texture": "#side_top"},
 				"down": {"uv": [0, 0, 16, 8], "texture": "#missing"}
 			}
 		},

diff --git a/src/main/resources/assets/interiors/models/block/floor_chair/right_cropped.json b/src/main/resources/assets/interiors/models/block/floor_chair/right_cropped.json
@@ -49,7 +49,7 @@
 				"east": {"uv": [0, 5, 16, 0], "rotation": 270, "texture": "#side_top"},
 				"south": {"uv": [0, 16, 16, 0], "texture": "#side_top"},
 				"west": {"uv": [0, 5, 16, 0], "rotation": 90, "texture": "#side_top"},
-				"up": {"uv": [0, 8, 16, 13], "texture": "#top"},
+				"up": {"uv": [0, 8, 16, 13], "texture": "#side_top"},
 				"down": {"uv": [0, 0, 16, 8], "texture": "#missing"}
 			}
 		},