- Update diagnoser for separated atlas textures

Blockception · Dec 10, 2024 · dedfb11 · dedfb11
1 parent e388c00
commit dedfb11
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Lib/Diagnostics/BehaviorPack/Block/components/diagnose.ts b/src/Lib/Diagnostics/BehaviorPack/Block/components/diagnose.ts
@@ -89,7 +89,7 @@ const component_test: Record<string, ComponentCheck> = {
   "minecraft:material_instances": (name, component, context, diagnoser) => {
     Object.keys(component).forEach(value => {
       const textureId = component[value].texture;
-      if (!diagnoser.context.getCache().resourcePacks.textures.find(val => val.id == textureId && val.location.uri.includes('terrain_texture')))
+      if (!diagnoser.context.getCache().resourcePacks.terrainTextures.find(val => val.id == textureId))
         diagnoser.add(textureId,
           `Texture reference "${textureId}" was not defined in terrain_texture.json`,
           DiagnosticSeverity.error,

diff --git a/src/Lib/Diagnostics/BehaviorPack/Item/components/diagnose.ts b/src/Lib/Diagnostics/BehaviorPack/Item/components/diagnose.ts
@@ -84,15 +84,15 @@ const component_test: Record<string, ComponentCheck> = {
   "minecraft:icon": (name, component, context, diagnoser) => {
     if (typeof component == 'string') {
       const textureId = component
-      if (!diagnoser.context.getCache().resourcePacks.textures.find(val => val.id == textureId && val.location.uri.includes('item_texture')))
+      if (!diagnoser.context.getCache().resourcePacks.itemTextures.find(val => val.id == textureId))
         diagnoser.add(textureId,
           `Texture reference "${textureId}" was not defined in item_texture.json`,
           DiagnosticSeverity.error,
           'behaviorpack.item.components.texture_not_found')
     } else {
       Object.keys(component.textures)?.forEach(value => {
         const textureId = component.textures[value];
-        if (!diagnoser.context.getCache().resourcePacks.textures.find(val => val.id == textureId && val.location.uri.includes('item_texture')))
+        if (!diagnoser.context.getCache().resourcePacks.itemTextures.find(val => val.id == textureId))
           diagnoser.add(textureId,
             `Texture reference "${textureId}" was not defined in item_texture.json`,
             DiagnosticSeverity.error,

diff --git a/src/Lib/Diagnostics/ResourcePack/Block/entry.ts b/src/Lib/Diagnostics/ResourcePack/Block/entry.ts
@@ -39,7 +39,7 @@ export function Diagnose(diagnoser: DocumentDiagnosticsBuilder): void {
 }
 
 function hasDefinition(block: string, value: string, rp: ResourcePackCollection, diagnoser: DiagnosticsBuilder): void {
-  if (rp.textures.has(value)) return;
+  if (rp.terrainTextures.has(value)) return;
 
   diagnoser.add(
     `${block}/${value}`,