diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 0d1e7fb9c..a6737ae84 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -407,7 +407,7 @@ public class BlockstateProvider extends BlockStateProvider { takeAll(remainingBlocks, b -> b instanceof BlockFloatingFlower).forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); - simpleBlock(b, models().getExistingFile(prefix("block/" + name))); + simpleBlock(b, new ModelFile.UncheckedModelFile(prefix("block/" + name))); }); takeAll(remainingBlocks, b -> b instanceof PaneBlock).forEach(b -> { diff --git a/src/main/java/vazkii/botania/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java index 2a1192ba1..b17dbd1e7 100644 --- a/src/main/java/vazkii/botania/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -30,8 +30,8 @@ public class DataGenerators { evt.getGenerator().addProvider(new RuneProvider(evt.getGenerator())); } if (evt.includeClient()) { - evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper())); + evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new ItemModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); } } diff --git a/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java b/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java index a708b0dea..b6494adcb 100644 --- a/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java +++ b/src/main/java/vazkii/botania/data/FloatingFlowerModelProvider.java @@ -13,6 +13,7 @@ import net.minecraft.data.DataGenerator; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.client.model.generators.ExistingFileHelper; +import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.client.model.generators.ModelProvider; import vazkii.botania.common.block.decor.BlockFloatingFlower; @@ -42,7 +43,7 @@ public class FloatingFlowerModelProvider extends ModelProvider