mc-assets 0.2.32 → 0.2.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Binary file
@@ -6890,64 +6890,57 @@
6890
6890
  "v": 0.328125,
6891
6891
  "tileIndex": 1376
6892
6892
  },
6893
- "entity/decorated_pot/decorated_pot_base": {
6894
- "u": 0.515625,
6895
- "v": 0.328125,
6896
- "tileIndex": 1377,
6897
- "su": 0.03125,
6898
- "sv": 0.03125
6899
- },
6900
6893
  "entity/decorated_pot/decorated_pot_side": {
6901
- "u": 0.546875,
6894
+ "u": 0.515625,
6902
6895
  "v": 0.328125,
6903
- "tileIndex": 1379
6896
+ "tileIndex": 1377
6904
6897
  },
6905
6898
  "entity/signs/oak": {
6906
- "u": 0.5625,
6899
+ "u": 0.53125,
6907
6900
  "v": 0.328125,
6908
- "tileIndex": 1380,
6901
+ "tileIndex": 1378,
6909
6902
  "su": 0.0625,
6910
6903
  "sv": 0.03125
6911
6904
  },
6912
6905
  "entity/sign": {
6913
- "u": 0.625,
6906
+ "u": 0.59375,
6914
6907
  "v": 0.328125,
6915
- "tileIndex": 1384,
6908
+ "tileIndex": 1382,
6916
6909
  "su": 0.0625,
6917
6910
  "sv": 0.03125
6918
6911
  },
6919
6912
  "entity/signs/acacia": {
6920
- "u": 0.6875,
6913
+ "u": 0.65625,
6921
6914
  "v": 0.328125,
6922
- "tileIndex": 1388,
6915
+ "tileIndex": 1386,
6923
6916
  "su": 0.0625,
6924
6917
  "sv": 0.03125
6925
6918
  },
6926
6919
  "entity/signs/birch": {
6927
- "u": 0.75,
6920
+ "u": 0.71875,
6928
6921
  "v": 0.328125,
6929
- "tileIndex": 1392,
6922
+ "tileIndex": 1390,
6930
6923
  "su": 0.0625,
6931
6924
  "sv": 0.03125
6932
6925
  },
6933
6926
  "entity/signs/dark_oak": {
6934
- "u": 0.8125,
6927
+ "u": 0.78125,
6935
6928
  "v": 0.328125,
6936
- "tileIndex": 1396,
6929
+ "tileIndex": 1394,
6937
6930
  "su": 0.0625,
6938
6931
  "sv": 0.03125
6939
6932
  },
6940
6933
  "entity/signs/jungle": {
6941
- "u": 0.875,
6934
+ "u": 0.84375,
6942
6935
  "v": 0.328125,
6943
- "tileIndex": 1400,
6936
+ "tileIndex": 1398,
6944
6937
  "su": 0.0625,
6945
6938
  "sv": 0.03125
6946
6939
  },
6947
6940
  "entity/signs/spruce": {
6948
- "u": 0.9375,
6941
+ "u": 0.90625,
6949
6942
  "v": 0.328125,
6950
- "tileIndex": 1404,
6943
+ "tileIndex": 1402,
6951
6944
  "su": 0.0625,
6952
6945
  "sv": 0.03125
6953
6946
  },
@@ -6972,340 +6965,347 @@
6972
6965
  "su": 0.0625,
6973
6966
  "sv": 0.03125
6974
6967
  },
6975
- "entity/signs/hanging/acacia": {
6968
+ "entity/decorated_pot/decorated_pot_base": {
6976
6969
  "u": 0.1875,
6977
6970
  "v": 0.359375,
6978
6971
  "tileIndex": 1484,
6972
+ "su": 0.03125,
6973
+ "sv": 0.03125
6974
+ },
6975
+ "entity/signs/hanging/acacia": {
6976
+ "u": 0.21875,
6977
+ "v": 0.359375,
6978
+ "tileIndex": 1486,
6979
6979
  "su": 0.0625,
6980
6980
  "sv": 0.03125
6981
6981
  },
6982
6982
  "entity/signs/bamboo": {
6983
- "u": 0.25,
6983
+ "u": 0.28125,
6984
6984
  "v": 0.359375,
6985
- "tileIndex": 1488,
6985
+ "tileIndex": 1490,
6986
6986
  "su": 0.0625,
6987
6987
  "sv": 0.03125
6988
6988
  },
6989
6989
  "entity/signs/hanging/bamboo": {
6990
- "u": 0.3125,
6990
+ "u": 0.34375,
6991
6991
  "v": 0.359375,
6992
- "tileIndex": 1492,
6992
+ "tileIndex": 1494,
6993
6993
  "su": 0.0625,
6994
6994
  "sv": 0.03125
6995
6995
  },
6996
6996
  "entity/signs/hanging/birch": {
6997
- "u": 0.375,
6997
+ "u": 0.40625,
6998
6998
  "v": 0.359375,
6999
- "tileIndex": 1496,
6999
+ "tileIndex": 1498,
7000
7000
  "su": 0.0625,
7001
7001
  "sv": 0.03125
7002
7002
  },
7003
7003
  "entity/signs/cherry": {
7004
- "u": 0.4375,
7004
+ "u": 0.46875,
7005
7005
  "v": 0.359375,
7006
- "tileIndex": 1500,
7006
+ "tileIndex": 1502,
7007
7007
  "su": 0.0625,
7008
7008
  "sv": 0.03125
7009
7009
  },
7010
7010
  "entity/signs/hanging/cherry": {
7011
- "u": 0.5,
7011
+ "u": 0.53125,
7012
7012
  "v": 0.359375,
7013
- "tileIndex": 1504,
7013
+ "tileIndex": 1506,
7014
7014
  "su": 0.0625,
7015
7015
  "sv": 0.03125
7016
7016
  },
7017
7017
  "entity/signs/hanging/crimson": {
7018
- "u": 0.5625,
7018
+ "u": 0.59375,
7019
7019
  "v": 0.359375,
7020
- "tileIndex": 1508,
7020
+ "tileIndex": 1510,
7021
7021
  "su": 0.0625,
7022
7022
  "sv": 0.03125
7023
7023
  },
7024
7024
  "entity/signs/hanging/dark_oak": {
7025
- "u": 0.625,
7025
+ "u": 0.65625,
7026
7026
  "v": 0.359375,
7027
- "tileIndex": 1512,
7027
+ "tileIndex": 1514,
7028
7028
  "su": 0.0625,
7029
7029
  "sv": 0.03125
7030
7030
  },
7031
7031
  "entity/signs/hanging/oak": {
7032
- "u": 0.6875,
7032
+ "u": 0.71875,
7033
7033
  "v": 0.359375,
7034
- "tileIndex": 1516,
7034
+ "tileIndex": 1518,
7035
7035
  "su": 0.0625,
7036
7036
  "sv": 0.03125
7037
7037
  },
7038
7038
  "entity/signs/hanging/jungle": {
7039
- "u": 0.75,
7039
+ "u": 0.78125,
7040
7040
  "v": 0.359375,
7041
- "tileIndex": 1520,
7041
+ "tileIndex": 1522,
7042
7042
  "su": 0.0625,
7043
7043
  "sv": 0.03125
7044
7044
  },
7045
7045
  "entity/signs/hanging/mangrove": {
7046
- "u": 0.8125,
7046
+ "u": 0.84375,
7047
7047
  "v": 0.359375,
7048
- "tileIndex": 1524,
7048
+ "tileIndex": 1526,
7049
7049
  "su": 0.0625,
7050
7050
  "sv": 0.03125
7051
7051
  },
7052
7052
  "entity/signs/hanging/pale_oak": {
7053
- "u": 0.875,
7053
+ "u": 0.90625,
7054
7054
  "v": 0.359375,
7055
- "tileIndex": 1528,
7055
+ "tileIndex": 1530,
7056
7056
  "su": 0.0625,
7057
7057
  "sv": 0.03125
7058
7058
  },
7059
7059
  "entity/signs/hanging/spruce": {
7060
- "u": 0.9375,
7061
- "v": 0.359375,
7062
- "tileIndex": 1532,
7063
- "su": 0.0625,
7064
- "sv": 0.03125
7065
- },
7066
- "entity/signs/hanging/warped": {
7067
7060
  "u": 0,
7068
7061
  "v": 0.390625,
7069
7062
  "tileIndex": 1600,
7070
7063
  "su": 0.0625,
7071
7064
  "sv": 0.03125
7072
7065
  },
7073
- "entity/bed/black": {
7066
+ "entity/signs/hanging/warped": {
7074
7067
  "u": 0.0625,
7075
7068
  "v": 0.390625,
7076
7069
  "tileIndex": 1604,
7077
7070
  "su": 0.0625,
7078
- "sv": 0.0625
7071
+ "sv": 0.03125
7079
7072
  },
7080
- "entity/bed/blue": {
7073
+ "entity/bed/black": {
7081
7074
  "u": 0.125,
7082
7075
  "v": 0.390625,
7083
7076
  "tileIndex": 1608,
7084
7077
  "su": 0.0625,
7085
7078
  "sv": 0.0625
7086
7079
  },
7087
- "entity/bed/brown": {
7080
+ "entity/bed/blue": {
7088
7081
  "u": 0.1875,
7089
7082
  "v": 0.390625,
7090
7083
  "tileIndex": 1612,
7091
7084
  "su": 0.0625,
7092
7085
  "sv": 0.0625
7093
7086
  },
7094
- "entity/bed/cyan": {
7087
+ "entity/bed/brown": {
7095
7088
  "u": 0.25,
7096
7089
  "v": 0.390625,
7097
7090
  "tileIndex": 1616,
7098
7091
  "su": 0.0625,
7099
7092
  "sv": 0.0625
7100
7093
  },
7101
- "entity/bed/gray": {
7094
+ "entity/bed/cyan": {
7102
7095
  "u": 0.3125,
7103
7096
  "v": 0.390625,
7104
7097
  "tileIndex": 1620,
7105
7098
  "su": 0.0625,
7106
7099
  "sv": 0.0625
7107
7100
  },
7108
- "entity/bed/green": {
7101
+ "entity/bed/gray": {
7109
7102
  "u": 0.375,
7110
7103
  "v": 0.390625,
7111
7104
  "tileIndex": 1624,
7112
7105
  "su": 0.0625,
7113
7106
  "sv": 0.0625
7114
7107
  },
7115
- "entity/bed/light_blue": {
7108
+ "entity/bed/green": {
7116
7109
  "u": 0.4375,
7117
7110
  "v": 0.390625,
7118
7111
  "tileIndex": 1628,
7119
7112
  "su": 0.0625,
7120
7113
  "sv": 0.0625
7121
7114
  },
7122
- "entity/bed/light_gray": {
7115
+ "entity/bed/light_blue": {
7123
7116
  "u": 0.5,
7124
7117
  "v": 0.390625,
7125
7118
  "tileIndex": 1632,
7126
7119
  "su": 0.0625,
7127
7120
  "sv": 0.0625
7128
7121
  },
7129
- "entity/bed/lime": {
7122
+ "entity/bed/light_gray": {
7130
7123
  "u": 0.5625,
7131
7124
  "v": 0.390625,
7132
7125
  "tileIndex": 1636,
7133
7126
  "su": 0.0625,
7134
7127
  "sv": 0.0625
7135
7128
  },
7136
- "entity/bed/magenta": {
7129
+ "entity/bed/lime": {
7137
7130
  "u": 0.625,
7138
7131
  "v": 0.390625,
7139
7132
  "tileIndex": 1640,
7140
7133
  "su": 0.0625,
7141
7134
  "sv": 0.0625
7142
7135
  },
7143
- "entity/bed/orange": {
7136
+ "entity/bed/magenta": {
7144
7137
  "u": 0.6875,
7145
7138
  "v": 0.390625,
7146
7139
  "tileIndex": 1644,
7147
7140
  "su": 0.0625,
7148
7141
  "sv": 0.0625
7149
7142
  },
7150
- "entity/bed/pink": {
7143
+ "entity/bed/orange": {
7151
7144
  "u": 0.75,
7152
7145
  "v": 0.390625,
7153
7146
  "tileIndex": 1648,
7154
7147
  "su": 0.0625,
7155
7148
  "sv": 0.0625
7156
7149
  },
7157
- "entity/bed/purple": {
7150
+ "entity/bed/pink": {
7158
7151
  "u": 0.8125,
7159
7152
  "v": 0.390625,
7160
7153
  "tileIndex": 1652,
7161
7154
  "su": 0.0625,
7162
7155
  "sv": 0.0625
7163
7156
  },
7164
- "entity/bed/red": {
7157
+ "entity/bed/purple": {
7165
7158
  "u": 0.875,
7166
7159
  "v": 0.390625,
7167
7160
  "tileIndex": 1656,
7168
7161
  "su": 0.0625,
7169
7162
  "sv": 0.0625
7170
7163
  },
7171
- "entity/bed/white": {
7164
+ "entity/bed/red": {
7172
7165
  "u": 0.9375,
7173
7166
  "v": 0.390625,
7174
7167
  "tileIndex": 1660,
7175
7168
  "su": 0.0625,
7176
7169
  "sv": 0.0625
7177
7170
  },
7178
- "entity/bed/yellow": {
7171
+ "entity/bed/white": {
7179
7172
  "u": 0,
7180
7173
  "v": 0.453125,
7181
7174
  "tileIndex": 1856,
7182
7175
  "su": 0.0625,
7183
7176
  "sv": 0.0625
7184
7177
  },
7185
- "entity/chest/ender": {
7178
+ "entity/bed/yellow": {
7186
7179
  "u": 0.0625,
7187
7180
  "v": 0.453125,
7188
7181
  "tileIndex": 1860,
7189
7182
  "su": 0.0625,
7190
7183
  "sv": 0.0625
7191
7184
  },
7192
- "entity/chest/normal_left": {
7185
+ "entity/chest/ender": {
7193
7186
  "u": 0.125,
7194
7187
  "v": 0.453125,
7195
7188
  "tileIndex": 1864,
7196
7189
  "su": 0.0625,
7197
7190
  "sv": 0.0625
7198
7191
  },
7199
- "entity/chest/trapped_left": {
7192
+ "entity/chest/normal_left": {
7200
7193
  "u": 0.1875,
7201
7194
  "v": 0.453125,
7202
7195
  "tileIndex": 1868,
7203
7196
  "su": 0.0625,
7204
7197
  "sv": 0.0625
7205
7198
  },
7206
- "entity/chest/normal": {
7199
+ "entity/chest/trapped_left": {
7207
7200
  "u": 0.25,
7208
7201
  "v": 0.453125,
7209
7202
  "tileIndex": 1872,
7210
7203
  "su": 0.0625,
7211
7204
  "sv": 0.0625
7212
7205
  },
7213
- "entity/chest/normal_right": {
7206
+ "entity/chest/normal": {
7214
7207
  "u": 0.3125,
7215
7208
  "v": 0.453125,
7216
7209
  "tileIndex": 1876,
7217
7210
  "su": 0.0625,
7218
7211
  "sv": 0.0625
7219
7212
  },
7220
- "entity/chest/trapped_right": {
7213
+ "entity/chest/normal_right": {
7221
7214
  "u": 0.375,
7222
7215
  "v": 0.453125,
7223
7216
  "tileIndex": 1880,
7224
7217
  "su": 0.0625,
7225
7218
  "sv": 0.0625
7226
7219
  },
7227
- "entity/chest/trapped": {
7220
+ "entity/chest/trapped_right": {
7228
7221
  "u": 0.4375,
7229
7222
  "v": 0.453125,
7230
7223
  "tileIndex": 1884,
7231
7224
  "su": 0.0625,
7232
7225
  "sv": 0.0625
7233
7226
  },
7234
- "entity/signs/pale_oak": {
7227
+ "entity/chest/trapped": {
7235
7228
  "u": 0.5,
7236
7229
  "v": 0.453125,
7237
7230
  "tileIndex": 1888,
7238
7231
  "su": 0.0625,
7239
- "sv": 0.03125
7232
+ "sv": 0.0625
7240
7233
  },
7241
- "entity/banner_base": {
7234
+ "entity/signs/pale_oak": {
7242
7235
  "u": 0.5625,
7243
7236
  "v": 0.453125,
7244
7237
  "tileIndex": 1892,
7245
7238
  "su": 0.0625,
7246
- "sv": 0.0625
7239
+ "sv": 0.03125
7247
7240
  },
7248
- "entity/creeper/creeper": {
7241
+ "entity/banner_base": {
7249
7242
  "u": 0.625,
7250
7243
  "v": 0.453125,
7251
7244
  "tileIndex": 1896,
7252
7245
  "su": 0.0625,
7253
- "sv": 0.03125
7246
+ "sv": 0.0625
7254
7247
  },
7255
- "entity/enderdragon/dragon": {
7248
+ "entity/creeper/creeper": {
7256
7249
  "u": 0.6875,
7257
7250
  "v": 0.453125,
7258
7251
  "tileIndex": 1900,
7252
+ "su": 0.0625,
7253
+ "sv": 0.03125
7254
+ },
7255
+ "entity/enderdragon/dragon": {
7256
+ "u": 0.75,
7257
+ "v": 0.453125,
7258
+ "tileIndex": 1904,
7259
7259
  "su": 0.25,
7260
7260
  "sv": 0.25
7261
7261
  },
7262
7262
  "entity/shulker/shulker_white": {
7263
- "u": 0.9375,
7264
- "v": 0.453125,
7265
- "tileIndex": 1916,
7266
- "su": 0.0625,
7267
- "sv": 0.0625
7268
- },
7269
- "entity/piglin/piglin": {
7270
7263
  "u": 0,
7271
7264
  "v": 0.703125,
7272
7265
  "tileIndex": 2880,
7273
7266
  "su": 0.0625,
7274
7267
  "sv": 0.0625
7275
7268
  },
7276
- "entity/player/slim/steve": {
7269
+ "entity/piglin/piglin": {
7277
7270
  "u": 0.0625,
7278
7271
  "v": 0.703125,
7279
7272
  "tileIndex": 2884,
7280
7273
  "su": 0.0625,
7281
7274
  "sv": 0.0625
7282
7275
  },
7283
- "entity/shulker/shulker": {
7276
+ "entity/player/slim/steve": {
7284
7277
  "u": 0.125,
7285
7278
  "v": 0.703125,
7286
7279
  "tileIndex": 2888,
7287
7280
  "su": 0.0625,
7288
7281
  "sv": 0.0625
7289
7282
  },
7290
- "entity/skeleton/skeleton": {
7283
+ "entity/shulker/shulker": {
7291
7284
  "u": 0.1875,
7292
7285
  "v": 0.703125,
7293
7286
  "tileIndex": 2892,
7294
7287
  "su": 0.0625,
7295
- "sv": 0.03125
7288
+ "sv": 0.0625
7296
7289
  },
7297
- "entity/skeleton/wither_skeleton": {
7290
+ "entity/skeleton/skeleton": {
7298
7291
  "u": 0.25,
7299
7292
  "v": 0.703125,
7300
7293
  "tileIndex": 2896,
7301
7294
  "su": 0.0625,
7302
7295
  "sv": 0.03125
7303
7296
  },
7304
- "entity/zombie/zombie": {
7297
+ "entity/skeleton/wither_skeleton": {
7305
7298
  "u": 0.3125,
7306
7299
  "v": 0.703125,
7307
7300
  "tileIndex": 2900,
7308
7301
  "su": 0.0625,
7302
+ "sv": 0.03125
7303
+ },
7304
+ "entity/zombie/zombie": {
7305
+ "u": 0.375,
7306
+ "v": 0.703125,
7307
+ "tileIndex": 2904,
7308
+ "su": 0.0625,
7309
7309
  "sv": 0.0625
7310
7310
  }
7311
7311
  }
@@ -72,19 +72,23 @@ export class ItemsRenderer {
72
72
  const itemModelPath = namespace ? `${namespace}:item/${name}` : `item/${name}`;
73
73
  const blockModelPath = namespace ? `${namespace}:block/${name}` : `block/${name}`;
74
74
  const cleanFullModelPath = namespace ? `${namespace}:${name}` : name;
75
+ const resolveModel = (path) => {
76
+ // todo resolve deep
77
+ return this.modelsStore.get(this.version, path);
78
+ };
75
79
  let model;
76
- if (cleanFullModelPath.includes('/') || exactItemResolve) {
77
- model = this.modelsStore.get(this.version, cleanFullModelPath);
78
- }
79
- else {
80
- model = this.modelsStore.get(this.version, itemModelPath);
80
+ {
81
+ model = resolveModel(cleanFullModelPath);
82
+ if (!exactItemResolve) {
83
+ model ??= resolveModel(itemModelPath);
84
+ }
81
85
  let blockModel = model?.parent?.includes('block/');
82
86
  if (!model) {
83
- model = this.modelsStore.get(this.version, blockModelPath);
87
+ model = resolveModel(blockModelPath);
84
88
  if (model)
85
89
  blockModel = true;
86
90
  }
87
- if (blockModel) {
91
+ if (blockModel || model?.elements) {
88
92
  return this.tryGetFullBlock(model, cleanFullModelPath);
89
93
  }
90
94
  }
@@ -6,6 +6,7 @@ import fs from 'fs';
6
6
  const blockstatesModels = JSON.parse(fs.readFileSync('./dist/blockStatesModels.json', 'utf8'));
7
7
  const itemsAtlases = JSON.parse(fs.readFileSync('./dist/itemsAtlases.json', 'utf8'));
8
8
  const blocksAtlases = JSON.parse(fs.readFileSync('./dist/blocksAtlases.json', 'utf8'));
9
+ blockstatesModels.models.latest['test:block/test'] = blockstatesModels.models.latest['minecraft:block/stone'];
9
10
  describe('ItemsRenderer', () => {
10
11
  const itemsAtlasParser = new AtlasParser(itemsAtlases, '');
11
12
  const blocksAtlasParser = new AtlasParser(blocksAtlases, '');
@@ -70,6 +71,43 @@ describe('ItemsRenderer', () => {
70
71
  }
71
72
  `);
72
73
  });
74
+ it('block/stone', () => {
75
+ expect(getItemTexture('block/stone')).toMatchInlineSnapshot(`
76
+ {
77
+ "left": {
78
+ "path": "blocks",
79
+ "slice": [
80
+ 816,
81
+ 64,
82
+ 16,
83
+ 16,
84
+ ],
85
+ "type": "blocks",
86
+ },
87
+ "resolvedModel": true,
88
+ "right": {
89
+ "path": "blocks",
90
+ "slice": [
91
+ 816,
92
+ 64,
93
+ 16,
94
+ 16,
95
+ ],
96
+ "type": "blocks",
97
+ },
98
+ "top": {
99
+ "path": "blocks",
100
+ "slice": [
101
+ 816,
102
+ 64,
103
+ 16,
104
+ 16,
105
+ ],
106
+ "type": "blocks",
107
+ },
108
+ }
109
+ `);
110
+ });
73
111
  it('invsprite textures', () => {
74
112
  expect(getItemTexture('chest')).toMatchInlineSnapshot(`
75
113
  {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mc-assets",
3
- "version": "0.2.32",
3
+ "version": "0.2.33",
4
4
  "author": "Vitaly Turovsky <vital2580@icloud.com>",
5
5
  "license": "MIT",
6
6
  "files": [