Stone Furniture is now also dynamic and registry driven

UnlikePaladin · May 20, 2024 · d559335 · d559335
1 parent 2fc84b2
commit d559335
Show file tree

Hide file tree

Showing 38 changed files with 326 additions and 199 deletions.
diff --git a/common/src/main/java/com/unlikepaladin/pfm/PaladinFurnitureMod.java b/common/src/main/java/com/unlikepaladin/pfm/PaladinFurnitureMod.java
@@ -11,6 +11,7 @@
 import com.unlikepaladin.pfm.config.PaladinFurnitureModConfig;
 
 import com.unlikepaladin.pfm.data.materials.DynamicBlockRegistry;
+import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry;
 import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry;
 import com.unlikepaladin.pfm.mixin.PFMPointOfInterestTypeAccessor;
 import com.unlikepaladin.pfm.registry.BlockEntityRegistry;
@@ -52,6 +53,8 @@ public void commonInit() {
 		updateChecker = new PaladinFurnitureModUpdateChecker();
 		updateChecker.checkForUpdates(getPFMConfig());
 		DynamicBlockRegistry.addBlockSetContainer(WoodVariantRegistry.INSTANCE.getType(), WoodVariantRegistry.INSTANCE);
+		DynamicBlockRegistry.addBlockSetContainer(StoneVariantRegistry.INSTANCE.getType(), StoneVariantRegistry.INSTANCE);
+
 		if (getModList().contains("cookingforblockheads"))
 			pfmModCompatibilities.add(PFMCookingForBlockheads.getInstance());
 		if (getModList().contains("farmersdelight"))

diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/AbstractBakedModel.java
@@ -1,19 +1,15 @@
 package com.unlikepaladin.pfm.blocks.models;
 
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
-import com.unlikepaladin.pfm.blocks.KitchenCounterBlock;
 import com.unlikepaladin.pfm.blocks.LogStoolBlock;
 import com.unlikepaladin.pfm.blocks.SimpleBedBlock;
 import com.unlikepaladin.pfm.data.materials.BlockType;
-import com.unlikepaladin.pfm.data.materials.StoneVariant;
 import com.unlikepaladin.pfm.data.materials.VariantBase;
 import com.unlikepaladin.pfm.data.materials.WoodVariant;
 import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems;
 import com.unlikepaladin.pfm.runtime.data.PFMRecipeProvider;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.entity.BedBlockEntity;
 import net.minecraft.client.render.TexturedRenderLayers;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.BakedQuad;

diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java
@@ -103,8 +103,7 @@ public static ExtraCounterVariant getExtraCounterType(Identifier identifier) {
 
     @Nullable
     public static StoneVariant getStoneType(Identifier identifier) {
-        for (StoneVariant variant:
-             StoneVariant.values()) {
+        for (StoneVariant variant : StoneVariantRegistry.getVariants()) {
             if (identifier.getPath().contains(variant.getPath()) && getBlockType(identifier) == BlockType.BLOCK) {
                 return variant;
             }

diff --git a/...va/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java b/...va/com/unlikepaladin/pfm/blocks/models/basicCoffeeTable/UnbakedCoffeeBasicTableModel.java
@@ -3,6 +3,7 @@
 import com.mojang.datafixers.util.Pair;
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
 import com.unlikepaladin.pfm.data.materials.StoneVariant;
+import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry;
 import com.unlikepaladin.pfm.data.materials.WoodVariant;
 import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry;
 import dev.architectury.injectables.annotations.ExpectPlatform;
@@ -51,7 +52,7 @@ public class UnbakedCoffeeBasicTableModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_coffee_table_basic"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_basic"));
             }
             add(TABLE_MODEL_ID);

diff --git a/.../src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java b/.../src/main/java/com/unlikepaladin/pfm/blocks/models/basicTable/UnbakedBasicTableModel.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.AffineTransformation;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -47,7 +46,7 @@ public class UnbakedBasicTableModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_table_basic"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_table_basic"));
             }
             add(TABLE_MODEL_ID);

diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/chair/UnbakedChairModel.java
@@ -3,6 +3,7 @@
 import com.mojang.datafixers.util.Pair;
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
 import com.unlikepaladin.pfm.data.materials.StoneVariant;
+import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry;
 import com.unlikepaladin.pfm.data.materials.WoodVariant;
 import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry;
 import dev.architectury.injectables.annotations.ExpectPlatform;
@@ -34,7 +35,7 @@ public class UnbakedChairModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_chair"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
 
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_chair"));
             }

diff --git a/.../main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java b/.../main/java/com/unlikepaladin/pfm/blocks/models/chairClassic/UnbakedChairClassicModel.java
@@ -3,6 +3,7 @@
 import com.mojang.datafixers.util.Pair;
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
 import com.unlikepaladin.pfm.data.materials.StoneVariant;
+import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry;
 import com.unlikepaladin.pfm.data.materials.WoodVariant;
 import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry;
 import dev.architectury.injectables.annotations.ExpectPlatform;
@@ -34,8 +35,7 @@ public class UnbakedChairClassicModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_chair_classic"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_chair_classic"));
             }
             add(CHAIR_MODEL_ID);

diff --git a/...rc/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java b/...rc/main/java/com/unlikepaladin/pfm/blocks/models/chairDinner/UnbakedChairDinnerModel.java
@@ -2,9 +2,7 @@
 
 import com.mojang.datafixers.util.Pair;
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
-import com.unlikepaladin.pfm.data.materials.StoneVariant;
-import com.unlikepaladin.pfm.data.materials.WoodVariant;
-import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry;
+import com.unlikepaladin.pfm.data.materials.*;
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.ModelBakeSettings;
@@ -34,7 +32,7 @@ public class UnbakedChairDinnerModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_chair_dinner"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
 
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_chair_dinner"));
             }

diff --git a/...rc/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java b/...rc/main/java/com/unlikepaladin/pfm/blocks/models/chairModern/UnbakedChairModernModel.java
@@ -3,6 +3,7 @@
 import com.mojang.datafixers.util.Pair;
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
 import com.unlikepaladin.pfm.data.materials.StoneVariant;
+import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry;
 import com.unlikepaladin.pfm.data.materials.WoodVariant;
 import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry;
 import dev.architectury.injectables.annotations.ExpectPlatform;
@@ -34,8 +35,7 @@ public class UnbakedChairModernModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_chair_modern"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_chair_modern"));
             }
             add(CHAIR_MODEL_ID);

diff --git a/...om/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java b/...om/unlikepaladin/pfm/blocks/models/classicCoffeeTable/UnbakedClassicCoffeeTableModel.java
@@ -3,6 +3,7 @@
 import com.mojang.datafixers.util.Pair;
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
 import com.unlikepaladin.pfm.data.materials.StoneVariant;
+import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry;
 import com.unlikepaladin.pfm.data.materials.WoodVariant;
 import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry;
 import dev.architectury.injectables.annotations.ExpectPlatform;
@@ -41,7 +42,7 @@ public class UnbakedClassicCoffeeTableModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_coffee_table_classic"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_coffee_table_classic"));
             }
             add(TABLE_MODEL_ID);

diff --git a/.../com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java b/.../com/unlikepaladin/pfm/blocks/models/classicNightstand/UnbakedClassicNightstandModel.java
@@ -9,7 +9,6 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -39,7 +38,7 @@ public class UnbakedClassicNightstandModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_classic_nightstand"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
 
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_classic_nightstand"));
             }

diff --git a/.../main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java b/.../main/java/com/unlikepaladin/pfm/blocks/models/classicStool/UnbakedClassicStoolModel.java
@@ -2,8 +2,8 @@
 
 import com.mojang.datafixers.util.Pair;
 import com.unlikepaladin.pfm.PaladinFurnitureMod;
-import com.unlikepaladin.pfm.data.materials.ExtraStoolVariant;
 import com.unlikepaladin.pfm.data.materials.StoneVariant;
+import com.unlikepaladin.pfm.data.materials.StoneVariantRegistry;
 import com.unlikepaladin.pfm.data.materials.WoodVariant;
 import com.unlikepaladin.pfm.data.materials.WoodVariantRegistry;
 import dev.architectury.injectables.annotations.ExpectPlatform;
@@ -34,7 +34,7 @@ public class UnbakedClassicStoolModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_classic_stool"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_classic_stool"));
             }
             add(STOOL_MODEL_ID);

diff --git a/.../main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java b/.../main/java/com/unlikepaladin/pfm/blocks/models/classicTable/UnbakedClassicTableModel.java
@@ -11,7 +11,6 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -40,7 +39,7 @@ public class UnbakedClassicTableModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_table_classic"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_table_classic"));
             }
             add(TABLE_MODEL_ID);

diff --git a/...rc/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java b/...rc/main/java/com/unlikepaladin/pfm/blocks/models/dinnerTable/UnbakedDinnerTableModel.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -37,7 +36,7 @@ public class UnbakedDinnerTableModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_table_dinner"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_table_dinner"));
             }
             add(TABLE_MODEL_ID);

diff --git a/...n/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java b/...n/java/com/unlikepaladin/pfm/blocks/models/kitchenCabinet/UnbakedKitchenCabinetModel.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -43,8 +42,8 @@ public class UnbakedKitchenCabinetModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_cabinet"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-                if (variant.equals(StoneVariant.QUARTZ))
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
+                if (variant.identifier.getPath().equals("quartz"))
                     continue;
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_cabinet"));
             }

diff --git a/...n/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java b/...n/java/com/unlikepaladin/pfm/blocks/models/kitchenCounter/UnbakedKitchenCounterModel.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -41,8 +40,8 @@ public class UnbakedKitchenCounterModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_counter"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-                if (variant.equals(StoneVariant.QUARTZ))
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
+                if (variant.identifier.getPath().equals("quartz"))
                     continue;
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_counter"));
             }

diff --git a/...om/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java b/...om/unlikepaladin/pfm/blocks/models/kitchenCounterOven/UnbakedKitchenCounterOvenModel.java
@@ -11,7 +11,6 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -40,8 +39,8 @@ public class UnbakedKitchenCounterOvenModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_counter_oven"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-                if (variant.equals(StoneVariant.QUARTZ))
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
+                if (variant.identifier.getPath().equals("quartz"))
                     continue;
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_counter_oven"));
             }

diff --git a/...ain/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java b/...ain/java/com/unlikepaladin/pfm/blocks/models/kitchenDrawer/UnbakedKitchenDrawerModel.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -47,8 +46,8 @@ public class UnbakedKitchenDrawerModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_drawer"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-                if (variant.equals(StoneVariant.QUARTZ))
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
+                if (variant.identifier.getPath().equals("quartz"))
                     continue;
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_drawer"));
             }

diff --git a/...rc/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java b/...rc/main/java/com/unlikepaladin/pfm/blocks/models/kitchenSink/UnbakedKitchenSinkModel.java
@@ -36,8 +36,8 @@ public class UnbakedKitchenSinkModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_sink"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-                if (variant.equals(StoneVariant.QUARTZ))
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
+                if (variant.identifier.getPath().equals("quartz"))
                     continue;
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_sink"));
             }

diff --git a/...om/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java b/...om/unlikepaladin/pfm/blocks/models/kitchenWallCounter/UnbakedKitchenWallCounterModel.java
@@ -37,8 +37,8 @@ public class UnbakedKitchenWallCounterModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_wall_counter"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-                if (variant.equals(StoneVariant.QUARTZ))
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
+                if (variant.identifier.getPath().equals("quartz"))
                     continue;
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_wall_counter"));
             }

diff --git a/.../com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java b/.../com/unlikepaladin/pfm/blocks/models/kitchenWallDrawer/UnbakedKitchenWallDrawerModel.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -44,8 +43,8 @@ public class UnbakedKitchenWallDrawerModel implements UnbakedModel {
                 if (variant.hasStripped())
                     add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/stripped_" + variant.asString() + "_kitchen_wall_drawer"));
             }
-            for(StoneVariant variant : StoneVariant.values()){
-                if (variant.equals(StoneVariant.QUARTZ))
+            for(StoneVariant variant : StoneVariantRegistry.getVariants()){
+                if (variant.identifier.getPath().equals("quartz"))
                     continue;
                 add(new Identifier(PaladinFurnitureMod.MOD_ID, "item/" + variant.asString() + "_kitchen_wall_drawer"));
             }