Fix chest rendering

Signed-off-by: Noaaan <[email protected]>

src/main/java/de/dafuqs/spectrum/blocks/chests/CompactingChestBlockEntityRenderer.java

@@ -17,7 +17,7 @@
 @Environment(EnvType.CLIENT)
 public class CompactingChestBlockEntityRenderer implements BlockEntityRenderer<CompactingChestBlockEntity> {
 
-	private static final SpriteIdentifier SPRITE_IDENTIFIER = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, SpectrumCommon.locate("entity/compacting_chest"));
+	private static final SpriteIdentifier SPRITE_IDENTIFIER = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, SpectrumCommon.locate("block/compacting_chest"));
 	private final ModelPart root;
 	private final ModelPart lid;
 	private final ModelPart column;

src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlockEntityRenderer.java

@@ -17,7 +17,7 @@
 @Environment(EnvType.CLIENT)
 public class RestockingChestBlockEntityRenderer implements BlockEntityRenderer<RestockingChestBlockEntity> {
 
-	private static final SpriteIdentifier spriteIdentifier = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, SpectrumCommon.locate("entity/restocking_chest"));
+	private static final SpriteIdentifier spriteIdentifier = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, SpectrumCommon.locate("block/restocking_chest"));
 	private final ModelPart root;
 	private final ModelPart lid;
 

src/main/java/de/dafuqs/spectrum/blocks/chests/SpectrumChestBlock.java

@@ -19,7 +19,7 @@
 import net.minecraft.util.shape.*;
 import net.minecraft.world.*;
 
-import static net.minecraft.client.render.TexturedRenderLayers.*;
+import static net.minecraft.client.texture.SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE;
 
 public abstract class SpectrumChestBlock extends BlockWithEntity {
 
@@ -135,7 +135,7 @@ public BlockState getPlacementState(ItemPlacementContext ctx) {
 	}
 
 	public SpriteIdentifier getTexture() {
-		return new SpriteIdentifier(CHEST_ATLAS_TEXTURE, SpectrumCommon.locate("entity/heartbound_chest"));
+		return new SpriteIdentifier(BLOCK_ATLAS_TEXTURE, SpectrumCommon.locate("block/heartbound_chest"));
 	}
 
 }

src/main/java/de/dafuqs/spectrum/blocks/structure/TreasureChestBlock.java

@@ -12,7 +12,7 @@
 import net.minecraft.world.*;
 import org.jetbrains.annotations.*;
 
-import static net.minecraft.client.render.TexturedRenderLayers.*;
+import static net.minecraft.client.texture.SpriteAtlasTexture.*;
 
 public class TreasureChestBlock extends SpectrumChestBlock {
 
@@ -45,9 +45,10 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, Block
 		return world.isClient ? checkType(type, SpectrumBlockEntities.PRESERVATION_CHEST, TreasureChestBlockEntity::clientTick) : null;
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public SpriteIdentifier getTexture() {
-		return new SpriteIdentifier(CHEST_ATLAS_TEXTURE, SpectrumCommon.locate("entity/preservation_chest"));
+		return new SpriteIdentifier(BLOCK_ATLAS_TEXTURE, SpectrumCommon.locate("block/preservation_chest"));
 	}
 
 }

src/main/java/de/dafuqs/spectrum/registries/SpectrumBlockEntities.java

@@ -170,20 +170,4 @@ public static void registerClient() {
 		BlockEntityRendererFactories.register(SpectrumBlockEntities.COLOR_PICKER, ColorPickerBlockEntityRenderer::new);
 	}
 
-	private static void registerTextureAtlasCallback() {
-		// TODO - Fix chest textures
-		// textures that are only referenced in code have to be added to the texture atlas manually
-		// Register textures in chest atlas
-		//		ClientSpriteRegistryCallback.event(TexturedRenderLayers.CHEST_ATLAS_TEXTURE).register((texture, registry) -> {
-		//			registry.register(SpectrumCommon.locate("entity/private_chest"));
-		//			registry.register(SpectrumCommon.locate("entity/preservation_chest"));
-		//		});
-		//
-		//		//Register textures in block atlas
-		//		ClientSpriteRegistryCallback.event(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE).register((texture, registry) -> {
-		//			registry.register(SpectrumCommon.locate("entity/pedestal_upgrade_speed"));
-		//			registry.register(SpectrumCommon.locate("entity/pastel_line"));
-		//		});
-	}
-
 }

src/main/resources/assets/spectrum/models/block/compacting_chest.json

@@ -6,8 +6,8 @@
     64
   ],
   "textures": {
-    "1": "spectrum:entity/compacting_chest",
-    "particle": "spectrum:entity/compacting_chest"
+    "1": "spectrum:block/compacting_chest",
+    "particle": "spectrum:block/compacting_chest"
   },
   "elements": [
     {

src/main/resources/assets/spectrum/models/block/heartbound_chest.json

@@ -6,8 +6,8 @@
     64
   ],
   "textures": {
-    "0": "spectrum:entity/heartbound_chest",
-    "particle": "spectrum:entity/heartbound_chest"
+    "0": "spectrum:block/heartbound_chest",
+    "particle": "spectrum:block/heartbound_chest"
   },
   "elements": [
     {

src/main/resources/assets/spectrum/models/block/preservation_chest.json

@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:block/block",
   "textures": {
-    "0": "spectrum:entity/treasure_chest",
+    "0": "spectrum:block/preservation_chest",
     "particle": "spectrum:block/preservation_stone"
   },
   "elements": [

src/main/resources/assets/spectrum/models/block/restocking_chest.json

@@ -6,8 +6,8 @@
     64
   ],
   "textures": {
-    "1": "spectrum:entity/restocking_chest",
-    "particle": "spectrum:entity/restocking_chest"
+    "1": "spectrum:block/restocking_chest",
+    "particle": "spectrum:block/restocking_chest"
   },
   "elements": [
     {