[PORT] Reverted to Python generation for code not supported in 1.19.2

Author: doc-bok

src/main/java/com/bokmcdok/butterflies/client/model/generators/ModBlockStateProvider.java

@@ -5,7 +5,7 @@
 import com.bokmcdok.butterflies.world.block.ButterflyOrigamiBlock;
 import com.bokmcdok.butterflies.world.block.FlowerCropBlock;
 import net.minecraft.core.FrontAndTop;
-import net.minecraft.data.PackOutput;
+import net.minecraft.data.DataGenerator;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CropBlock;
@@ -26,12 +26,12 @@ public class ModBlockStateProvider extends BlockStateProvider {
 
     /**
      * Construction.
-     * @param output The pack to output data to.
+     * @param dataGenerator The pack to dataGenerator data to.
      * @param existingFileHelper Helper to access existing files.
      */
-    public ModBlockStateProvider(PackOutput output,
+    public ModBlockStateProvider(DataGenerator dataGenerator,
                                  ExistingFileHelper existingFileHelper) {
-        super(output, ButterfliesMod.MOD_ID, existingFileHelper);
+        super(dataGenerator, ButterfliesMod.MOD_ID, existingFileHelper);
     }
 
     /**
@@ -62,8 +62,8 @@ protected void registerStatesAndModels() {
         registerFlowerBud(BlockRegistry.WITHER_ROSE_BUD);
 
         // Functional Blocks
-        simpleBlockWithItem(BlockRegistry.BUTTERFLY_FEEDER.get(), models().getExistingFile(BlockRegistry.BUTTERFLY_FEEDER.getId()));
-        simpleBlockWithItem(BlockRegistry.BUTTERFLY_MICROSCOPE.get(), models().getExistingFile(BlockRegistry.BUTTERFLY_MICROSCOPE.getId()));
+        simpleBlockItem(BlockRegistry.BUTTERFLY_FEEDER.get(), models().getExistingFile(BlockRegistry.BUTTERFLY_FEEDER.getId()));
+        simpleBlockItem(BlockRegistry.BUTTERFLY_MICROSCOPE.get(), models().getExistingFile(BlockRegistry.BUTTERFLY_MICROSCOPE.getId()));
 
         // Origami
         for(RegistryObject<Block> origami : BlockRegistry.BUTTERFLY_ORIGAMI) {

src/main/java/com/bokmcdok/butterflies/client/model/generators/ModItemModelProvider.java

@@ -4,7 +4,7 @@
 import com.bokmcdok.butterflies.registries.ButterflyEntityTypeRegistry;
 import com.bokmcdok.butterflies.registries.ItemRegistry;
 import com.bokmcdok.butterflies.registries.SpawnEggRegistry;
-import net.minecraft.data.PackOutput;
+import net.minecraft.data.DataGenerator;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.client.model.generators.ItemModelProvider;
@@ -23,11 +23,11 @@ public class ModItemModelProvider extends ItemModelProvider {
 
     /**
      * Construction
-     * @param output The pack to output the resources to.
+     * @param dataGenerator The pack to dataGenerator the resources to.
      * @param existingFileHelper A helper containing the existing files.
      */
-    public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
-        super(output, ButterfliesMod.MOD_ID, existingFileHelper);
+    public ModItemModelProvider(DataGenerator dataGenerator, ExistingFileHelper existingFileHelper) {
+        super(dataGenerator, ButterfliesMod.MOD_ID, existingFileHelper);
     }
 
     /**