Skip to content

Commit

Permalink
fixed tater models, textures. fixes walrus, ding sound
Browse files Browse the repository at this point in the history
  • Loading branch information
@Khazoda
Khazoda committed Sep 11, 2023
1 parent c5f7395 commit 00c609b
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 143 deletions.
2 changes: 1 addition & 1 deletion src/main/generated/.cache/410384ec71d3ba822ecd258fe3a43188bad1b973
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// 1.20.1 2023-09-11T16:20:56.9586517 Plushables/Model Definitions
// 1.20.1 2023-09-11T16:34:06.0351972 Plushables/Model Definitions
2 changes: 1 addition & 1 deletion src/main/generated/.cache/5ea3117a1096973a80b268a9b8098b12f61a649b
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-09-11T16:20:56.9586517 Plushables/Advancements
// 1.20.1 2023-09-11T16:34:06.0336928 Plushables/Advancements
94ce905fe57134b341373febb4946ec1dc6866af data\minecraft\advancements\plushables\got_builder.json
7139ef3f97fc8ab02dd9dc665e5203927f00380d data\minecraft\advancements\plushables\root.json
830b27b5db40e0a08a0fc99ee884640937c287ed data\minecraft\advancements\plushables\got_heart.json
Expand Down
2 changes: 1 addition & 1 deletion src/main/generated/.cache/89c68f8ecdb523fbbdc7516f8d37998e94ad8722
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2023-09-11T16:20:56.9566509 Plushables/Block Loot Tables
// 1.20.1 2023-09-11T16:34:06.0316925 Plushables/Block Loot Tables
bbb62eef393b69c4787cd4732718266d7e86bb1f data\plushables\loot_tables\blocks\mammoth_plushable.json
d0c350e5c2a819e4ba0c7ffe981b11f64304c070 data\plushables\loot_tables\blocks\walrus_plushable.json
439aedde262bbf604799292a05f2800d5b7087cb data\plushables\loot_tables\blocks\basket_block.json
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/seacroak/plushables/block/WalrusBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ public WalrusBlock() {
@Override
public VoxelShape getShape() {
VoxelShape shape = VoxelShapes.empty();
shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.25, 0, 0.0625, 0.75, 0.46875, 0.75));
shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.296875, 0.46875, 0.0625, 0.703125, 0.78125, 0.390625));
shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.296875, 0.46875, 0.390625, 0.703125, 0.59375, 0.5625));
shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.315625, 0.0625, 0.40625, 0.684375, 0.46875, 0.71875));
shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.30625, 0.40625, 0.0625, 0.69375, 0.78125, 0.375));
shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.40625, 0.46875, 0.03125, 0.59375, 0.65625, 0.21875));
shape = VoxelShapes.union(shape, VoxelShapes.cuboid(0.309375, 0.125, 0.15625, 0.690625, 0.59375, 0.53125));
return shape;
}
}
149 changes: 62 additions & 87 deletions src/main/resources/assets/plushables/models/block/big_irritater_plushable.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "plushables:block/big_irritater_texture",
"particle": "plushables:block/blank"
Expand All @@ -10,153 +11,129 @@
"from": [11, 0, 3],
"to": [14, 3, 6],
"faces": {
"north": {"uv": [13, 0, 16, 3], "texture": "#0"},
"east": {"uv": [13, 0, 16, 3], "texture": "#0"},
"south": {"uv": [13, 0, 16, 3], "texture": "#0"},
"west": {"uv": [13, 0, 16, 3], "texture": "#0"},
"up": {"uv": [13, 0, 16, 3], "texture": "#0"},
"down": {"uv": [13, 3, 16, 6], "texture": "#0"}
"north": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"east": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"south": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"west": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"up": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"down": {"uv": [6.5, 1.5, 8, 3], "texture": "#0"}
}
},
{
"name": "foot_front_left",
"from": [2, 0, 3],
"to": [5, 3, 6],
"faces": {
"north": {"uv": [13, 0, 16, 3], "texture": "#0"},
"east": {"uv": [13, 0, 16, 3], "texture": "#0"},
"south": {"uv": [13, 0, 16, 3], "texture": "#0"},
"west": {"uv": [13, 0, 16, 3], "texture": "#0"},
"up": {"uv": [13, 0, 16, 3], "texture": "#0"},
"down": {"uv": [13, 3, 16, 6], "texture": "#0"}
"north": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"east": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"south": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"west": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"up": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"down": {"uv": [6.5, 1.5, 8, 3], "texture": "#0"}
}
},
{
"name": "foot_back_left",
"from": [2, 0, 10],
"to": [5, 3, 13],
"faces": {
"north": {"uv": [13, 0, 16, 3], "texture": "#0"},
"east": {"uv": [13, 0, 16, 3], "texture": "#0"},
"south": {"uv": [13, 0, 16, 3], "texture": "#0"},
"west": {"uv": [13, 0, 16, 3], "texture": "#0"},
"up": {"uv": [13, 0, 16, 3], "texture": "#0"},
"down": {"uv": [13, 3, 16, 6], "texture": "#0"}
"north": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"east": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"south": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"west": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"up": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"down": {"uv": [6.5, 1.5, 8, 3], "texture": "#0"}
}
},
{
"name": "foot_back_right",
"from": [11, 0, 10],
"to": [14, 3, 13],
"faces": {
"north": {"uv": [13, 0, 16, 3], "texture": "#0"},
"east": {"uv": [13, 0, 16, 3], "texture": "#0"},
"south": {"uv": [13, 0, 16, 3], "texture": "#0"},
"west": {"uv": [13, 0, 16, 3], "texture": "#0"},
"up": {"uv": [13, 0, 16, 3], "texture": "#0"},
"down": {"uv": [13, 3, 16, 6], "texture": "#0"}
}
},
{
"name": "face",
"from": [4, 10, 1.5],
"to": [12, 13, 2],
"faces": {
"north": {"uv": [8, 12, 16, 15], "texture": "#0"},
"east": {"uv": [2, 3, 2.5, 6], "texture": "#0"},
"west": {"uv": [9, 3, 9.5, 6], "texture": "#0"},
"up": {"uv": [2, 2, 10, 2.5], "texture": "#0"},
"down": {"uv": [2, 5, 10, 5.5], "texture": "#0"}
}
},
{
"name": "mouth",
"from": [4, 6, 1.5],
"to": [12, 9, 2],
"faces": {
"north": {"uv": [0, 12, 8, 15], "texture": "#0"},
"east": {"uv": [9, 8, 9.5, 11], "texture": "#0"},
"west": {"uv": [2, 8, 2.5, 11], "texture": "#0"},
"up": {"uv": [2, 7, 10, 7.5], "texture": "#0"},
"down": {"uv": [2, 11, 10, 11.5], "texture": "#0"}
"north": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"east": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"south": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"west": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"up": {"uv": [6.5, 0, 8, 1.5], "texture": "#0"},
"down": {"uv": [6.5, 1.5, 8, 3], "texture": "#0"}
}
},
{
"name": "base",
"from": [2, 3, 3],
"to": [14, 4, 13],
"faces": {
"north": {"uv": [0, 15, 12, 16], "texture": "#0"},
"east": {"uv": [0, 15, 10, 16], "texture": "#0"},
"south": {"uv": [0, 15, 12, 16], "texture": "#0"},
"west": {"uv": [0, 15, 10, 16], "texture": "#0"},
"up": {"uv": [0, 0, 1, 1], "texture": "#0"},
"down": {"uv": [14, 4, 15, 5], "texture": "#0"}
"north": {"uv": [0, 7.5, 6, 8], "texture": "#0"},
"east": {"uv": [0, 7.5, 5, 8], "texture": "#0"},
"south": {"uv": [0, 7.5, 6, 8], "texture": "#0"},
"west": {"uv": [0, 7.5, 5, 8], "texture": "#0"},
"up": {"uv": [0, 0, 0.5, 0.5], "texture": "#0"},
"down": {"uv": [7, 2, 7.5, 2.5], "texture": "#0"}
}
},
{
"name": "body",
"from": [2, 4, 2],
"to": [14, 16, 14],
"faces": {
"north": {"uv": [0, 0, 12, 12], "texture": "#0"},
"east": {"uv": [0, 0, 12, 12], "texture": "#0"},
"south": {"uv": [0, 0, 12, 12], "texture": "#0"},
"west": {"uv": [0, 0, 12, 12], "texture": "#0"},
"up": {"uv": [11, 0, 12, 1], "texture": "#0"},
"down": {"uv": [0, 0, 12, 12], "texture": "#0"}
"north": {"uv": [10, 0, 16, 6], "texture": "#0"},
"east": {"uv": [0, 0, 6, 6], "texture": "#0"},
"south": {"uv": [0, 0, 6, 6], "texture": "#0"},
"west": {"uv": [0, 0, 6, 6], "texture": "#0"},
"up": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"down": {"uv": [0, 0, 6, 6], "texture": "#0"}
}
},
{
"name": "bit",
"from": [2, 16, 2],
"to": [3, 17, 3],
"faces": {
"north": {"uv": [11, 0, 12, 1], "texture": "#0"},
"east": {"uv": [11, 0, 12, 1], "texture": "#0"},
"south": {"uv": [11, 0, 12, 1], "texture": "#0"},
"west": {"uv": [11, 0, 12, 1], "texture": "#0"},
"up": {"uv": [11, 0, 12, 1], "texture": "#0"},
"down": {"uv": [11, 0, 12, 1], "texture": "#0"}
"north": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"east": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"south": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"west": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"up": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"down": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"}
}
},
{
"name": "bit",
"from": [13, 16, 2],
"to": [14, 17, 3],
"faces": {
"north": {"uv": [11, 0, 12, 1], "texture": "#0"},
"east": {"uv": [11, 0, 12, 1], "texture": "#0"},
"south": {"uv": [11, 0, 12, 1], "texture": "#0"},
"west": {"uv": [11, 0, 12, 1], "texture": "#0"},
"up": {"uv": [11, 0, 12, 1], "texture": "#0"},
"down": {"uv": [11, 0, 12, 1], "texture": "#0"}
"north": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"east": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"south": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"west": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"up": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"down": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"}
}
},
{
"name": "bit",
"from": [14, 15, 2],
"to": [15, 16, 3],
"faces": {
"north": {"uv": [11, 0, 12, 1], "texture": "#0"},
"east": {"uv": [11, 0, 12, 1], "texture": "#0"},
"south": {"uv": [11, 0, 12, 1], "texture": "#0"},
"west": {"uv": [11, 0, 12, 1], "texture": "#0"},
"up": {"uv": [11, 0, 12, 1], "texture": "#0"},
"down": {"uv": [11, 0, 12, 1], "texture": "#0"}
"north": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"east": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"south": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"west": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"up": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"down": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"}
}
},
{
"name": "bit",
"from": [1, 15, 2],
"to": [2, 16, 3],
"faces": {
"north": {"uv": [11, 0, 12, 1], "texture": "#0"},
"east": {"uv": [11, 0, 12, 1], "texture": "#0"},
"south": {"uv": [11, 0, 12, 1], "texture": "#0"},
"west": {"uv": [11, 0, 12, 1], "texture": "#0"},
"up": {"uv": [11, 0, 12, 1], "texture": "#0"},
"down": {"uv": [11, 0, 12, 1], "texture": "#0"}
"north": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"east": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"south": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"west": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"up": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"},
"down": {"uv": [5.5, 0, 6, 0.5], "texture": "#0"}
}
}
],
Expand Down Expand Up @@ -209,13 +186,11 @@
3,
4,
5,
6,
7,
{
"name": "bits",
"origin": [0, 0, 0],
"color": 0,
"children": [8, 9, 10, 11]
"children": [6, 7, 8, 9]
}
]
}
Expand Down
Loading

0 comments on commit 00c609b

Please sign in to comment.