Use Block Model Generator for all models

Forge/src/main/java/net/potionstudios/woodwevegot/forge/datagen/generators/ModelGenerators.java

@@ -5,8 +5,6 @@
 import net.minecraft.data.PackOutput;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.BarrelBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.LadderBlock;
@@ -21,43 +19,6 @@ public class ModelGenerators {
 
     public static void init(DataGenerator generator, boolean run, PackOutput output, ExistingFileHelper exFileHelper) {
         generator.addProvider(run, new BlockModelGenerators(output, exFileHelper));
-        generator.addProvider(run, new ItemModelGenerators(output, exFileHelper));
-    }
-
-    /**
-     * Used to generate models for items.
-     * @see ItemModelProvider
-     */
-    private static class ItemModelGenerators extends ItemModelProvider {
-
-        private ItemModelGenerators(PackOutput output, ExistingFileHelper existingFileHelper) {
-            super(output, WoodWeveGot.MOD_ID, existingFileHelper);
-        }
-
-        @Override
-        protected void registerModels() {
-            WWGWoodSet.getWoodSets().forEach(set -> {
-                try {
-                    simpleItemBlockTexture(set.name(), set.ladder());
-                } catch (Exception ignored) {}
-            });
-        }
-
-        private ResourceLocation woodBlockTexture(String type, String name) {
-            return WoodWeveGot.id(ModelProvider.BLOCK_FOLDER + "/" + type + "/" + name);
-        }
-
-        private void simpleItemBlockTexture(String set, ItemLike item) {
-            singleTexture(name(item), mcLoc("item/generated"), "layer0", WoodWeveGot.id(ModelProvider.BLOCK_FOLDER + "/" + set + "/" + name(item).replace(set + "_", "")));
-        }
-
-        private String name(ItemLike item) {
-            return key(item.asItem()).getPath();
-        }
-
-        private ResourceLocation key(Item item) {
-            return ForgeRegistries.ITEMS.getKey(item);
-        }
     }
 
     /**
@@ -87,6 +48,7 @@ else if (blockState.getValue(LadderBlock.FACING) == Direction.WEST)
                             return ConfiguredModel.builder().modelFile(modelFile).rotationY(270).build();
                         else return ConfiguredModel.builder().modelFile(modelFile).build();
                     }, LadderBlock.WATERLOGGED);
+                    itemModels().singleTexture(name(set.ladder()), mcLoc("item/generated"), "layer0", woodBlockTexture(set.name(), "ladder"));
                 }
                 if (models().existingFileHelper.exists(woodBlockTextureFolder(set.name(), "barrel_top"), PackType.CLIENT_RESOURCES)) {
                     ModelFile modelFile = models().cubeBottomTop(name(set.barrel()), woodBlockTexture(set.name(), "barrel_side"), woodBlockTexture(set.name(), "barrel_bottom"), woodBlockTexture(set.name(), "barrel_top"));
@@ -112,15 +74,6 @@ else if (blockState.getValue(LadderBlock.FACING) == Direction.WEST)
             });
         }
 
-        private ConfiguredModel[] createRotatedModels(ModelFile model) {
-            return ConfiguredModel.builder()
-                    .modelFile(model)
-                    .nextModel().modelFile(model).rotationY(90)
-                    .nextModel().modelFile(model).rotationY(180)
-                    .nextModel().modelFile(model).rotationY(270)
-                    .build();
-        }
-
         private ResourceLocation woodBlockTexture(String type, String name) {
             return WoodWeveGot.id(ModelProvider.BLOCK_FOLDER + "/" + type + "/" + name);
         }

build.gradle.kts

@@ -6,7 +6,7 @@ import org.gradle.kotlin.dsl.get
 plugins {
     id("architectury-plugin") version "3.4-SNAPSHOT"
     id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false
-    id("com.gradleup.shadow") version "8.3.3" apply false
+    id("com.gradleup.shadow") version "8.3.5" apply false
     id("com.hypherionmc.modutils.modpublisher") version "2.+"
     java
     idea

gradle.properties

@@ -6,18 +6,18 @@ archives_base_name=All-The-Wood-Weve-Got
 mod_version=1.0.0-Indev-SNAPSHOT
 maven_group=net.potionstudios
 
-fabric_loader_version=0.16.7
+fabric_loader_version=0.16.9
 fabric_api_version=0.92.2
 
-forge_version=47.3.11
+forge_version=47.3.12
 neoforge_version=47.1.106
 use_neoforge=false
 
 parchment=2023.09.03
 
 devauth_version=1.2.1
 
-bwg_version=1.3.2
+bwg_version=1.4.1
 terrablender_version=3.0.1.7
 geckolib_version=4.4.9
 corgilib_version=4.0.3.2