Fix chicken-and-egg problem when regenerating data from scratch

This commit is contained in:
Vincent Lee committed 2020-07-23 12:12:46 -05:00
1 parent a666005342
commit d90dbc5394
3 files changed
+4 -3

No files matched your search

@@ -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 -> {
@@ -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()));
}
}
@@ -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<FloatingFlowerMod
getBuilder(name)
.parent(getExistingFile(new ResourceLocation("block/block")))
.withFlowerModel(getExistingFile(prefix(nonFloat)));
.withFlowerModel(new ModelFile.UncheckedModelFile(prefix("block/" + nonFloat)));
}
}
}