diff --git a/src/main/generated/resources/assets/minestuck/blockstates/uncarved_wood.json b/src/main/generated/resources/assets/minestuck/blockstates/uncarved_wood.json
new file mode 100644
index 0000000000..67f5c9a980
--- /dev/null
+++ b/src/main/generated/resources/assets/minestuck/blockstates/uncarved_wood.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minestuck:block/uncarved_wood"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/generated/resources/assets/minestuck/models/block/uncarved_wood.json b/src/main/generated/resources/assets/minestuck/models/block/uncarved_wood.json
new file mode 100644
index 0000000000..081d5af29f
--- /dev/null
+++ b/src/main/generated/resources/assets/minestuck/models/block/uncarved_wood.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "minestuck:block/uncarved_wood"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/minestuck/models/item/ace_of_clubs.json b/src/main/generated/resources/assets/minestuck/models/item/ace_of_clubs.json
similarity index 61%
rename from src/main/resources/assets/minestuck/models/item/ace_of_clubs.json
rename to src/main/generated/resources/assets/minestuck/models/item/ace_of_clubs.json
index 48cc33fbdf..29435d7715 100644
--- a/src/main/resources/assets/minestuck/models/item/ace_of_clubs.json
+++ b/src/main/generated/resources/assets/minestuck/models/item/ace_of_clubs.json
@@ -1,6 +1,6 @@
 {
-  "parent": "item/handheld",
+  "parent": "minecraft:item/handheld",
   "textures": {
     "layer0": "minestuck:item/ace_clubs"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/generated/resources/assets/minestuck/models/item/uncarved_wood.json b/src/main/generated/resources/assets/minestuck/models/item/uncarved_wood.json
new file mode 100644
index 0000000000..fc2b16f31b
--- /dev/null
+++ b/src/main/generated/resources/assets/minestuck/models/item/uncarved_wood.json
@@ -0,0 +1,3 @@
+{
+  "parent": "minestuck:block/uncarved_wood"
+}
\ No newline at end of file
diff --git a/src/main/java/com/mraof/minestuck/data/MinestuckBlockStateProvider.java b/src/main/java/com/mraof/minestuck/data/MinestuckBlockStateProvider.java
new file mode 100644
index 0000000000..fef22cbdda
--- /dev/null
+++ b/src/main/java/com/mraof/minestuck/data/MinestuckBlockStateProvider.java
@@ -0,0 +1,27 @@
+package com.mraof.minestuck.data;
+
+import com.mraof.minestuck.Minestuck;
+import com.mraof.minestuck.block.MSBlocks;
+import net.minecraft.data.DataGenerator;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
+import net.minecraftforge.client.model.generators.BlockStateProvider;
+import net.minecraftforge.client.model.generators.ItemModelBuilder;
+import net.minecraftforge.common.data.ExistingFileHelper;
+import net.minecraftforge.registries.RegistryObject;
+
+public class MinestuckBlockStateProvider extends BlockStateProvider
+{
+	public MinestuckBlockStateProvider(DataGenerator gen, ExistingFileHelper exFileHelper)
+	{
+		super(gen, Minestuck.MOD_ID, exFileHelper);
+	}
+	
+	@Override
+	protected void registerStatesAndModels()
+	{
+		
+		simpleBlock(MSBlocks.UNCARVED_WOOD.get());
+		
+	}
+}
diff --git a/src/main/java/com/mraof/minestuck/data/MinestuckData.java b/src/main/java/com/mraof/minestuck/data/MinestuckData.java
index ad19461263..2e07823b22 100644
--- a/src/main/java/com/mraof/minestuck/data/MinestuckData.java
+++ b/src/main/java/com/mraof/minestuck/data/MinestuckData.java
@@ -63,6 +63,8 @@ public static void gatherData(GatherDataEvent event)
 		
 		gen.addProvider(event.includeServer(), new StartingModusProvider(gen, Minestuck.MOD_ID));
 		
+		gen.addProvider(event.includeClient(), new MinestuckBlockStateProvider(gen, fileHelper));
+		gen.addProvider(event.includeClient(), new MinestuckItemModelProvider(gen, fileHelper));
 		gen.addProvider(event.includeClient(), new MinestuckEnUsLanguageProvider(gen));
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/com/mraof/minestuck/data/MinestuckItemModelProvider.java b/src/main/java/com/mraof/minestuck/data/MinestuckItemModelProvider.java
new file mode 100644
index 0000000000..01392a4449
--- /dev/null
+++ b/src/main/java/com/mraof/minestuck/data/MinestuckItemModelProvider.java
@@ -0,0 +1,66 @@
+package com.mraof.minestuck.data;
+
+import com.mraof.minestuck.Minestuck;
+import com.mraof.minestuck.block.MSBlocks;
+import com.mraof.minestuck.item.MSItems;
+import net.minecraft.data.DataGenerator;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.minecraftforge.client.model.generators.ItemModelBuilder;
+import net.minecraftforge.client.model.generators.ItemModelProvider;
+import net.minecraftforge.common.data.ExistingFileHelper;
+import net.minecraftforge.registries.RegistryObject;
+
+public class MinestuckItemModelProvider extends ItemModelProvider
+{
+	public MinestuckItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper)
+	{
+		super(generator, Minestuck.MOD_ID, existingFileHelper);
+	}
+	
+	@Override
+	protected void registerModels()
+	{
+		
+		handheldItemTextureName(MSItems.ACE_OF_CLUBS, "ace_clubs");
+		
+		//Blocks
+		blockItem(MSBlocks.UNCARVED_WOOD);
+		
+	}
+	
+	private ItemModelBuilder simpleItem(RegistryObject<Item> item)
+	{
+		return withExistingParent(item.getId().getPath(),
+				new ResourceLocation("item/generated")).texture("layer0",
+				new ResourceLocation(Minestuck.MOD_ID, "item/" + item.getId().getPath()));
+	}
+	
+	private ItemModelBuilder simpleItemTextureName(RegistryObject<Item> item, String textureName)
+	{
+		return withExistingParent(item.getId().getPath(),
+				new ResourceLocation("item/generated")).texture("layer0",
+				new ResourceLocation(Minestuck.MOD_ID, "item/" + textureName));
+	}
+	
+	private ItemModelBuilder handheldItem(RegistryObject<Item> item)
+	{
+		return withExistingParent(item.getId().getPath(),
+				new ResourceLocation("item/handheld")).texture("layer0",
+				new ResourceLocation(Minestuck.MOD_ID, "item/" + item.getId().getPath()));
+	}
+	
+	private ItemModelBuilder handheldItemTextureName(RegistryObject<Item> item, String textureName)
+	{
+		return withExistingParent(item.getId().getPath(),
+				new ResourceLocation("item/handheld")).texture("layer0",
+				new ResourceLocation(Minestuck.MOD_ID, "item/" + textureName));
+	}
+	
+	private ItemModelBuilder blockItem(RegistryObject<Block> block)
+	{
+		return withExistingParent(block.getId().getPath(),
+				new ResourceLocation("minestuck:block/" + block.getId().getPath()));
+	}
+}
diff --git a/src/main/resources/assets/minestuck/blockstates/uncarved_wood.json b/src/main/resources/assets/minestuck/blockstates/uncarved_wood.json
deleted file mode 100644
index 84e83156ed..0000000000
--- a/src/main/resources/assets/minestuck/blockstates/uncarved_wood.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "minestuck:block/uncarved_wood" }
-    }
-}
diff --git a/src/main/resources/assets/minestuck/models/block/uncarved_wood.json b/src/main/resources/assets/minestuck/models/block/uncarved_wood.json
deleted file mode 100644
index f9ccc8b43d..0000000000
--- a/src/main/resources/assets/minestuck/models/block/uncarved_wood.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "minestuck:block/uncarved_wood"
-    }
-}
diff --git a/src/main/resources/assets/minestuck/models/item/uncarved_wood.json b/src/main/resources/assets/minestuck/models/item/uncarved_wood.json
deleted file mode 100644
index 79e40b55e4..0000000000
--- a/src/main/resources/assets/minestuck/models/item/uncarved_wood.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parent": "minestuck:block/uncarved_wood"
-}