Fix three high template model, fix floating flower blockstates being deleted accidentally

This commit is contained in:
Vincent Lee committed 2020-07-03 19:02:58 -05:00
1 parent 00b0b63262
commit 512945af89
68 files changed
+462 -5

No files matched your search

@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/black_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/blue_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/brown_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/cyan_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_agricarnation"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_agricarnation_chibi"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_bellethorn"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_bellethorn_chibi"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_bergamute"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_bubbell"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_bubbell_chibi"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_clayconia"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_clayconia_chibi"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_daffomill"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_dandelifeon"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_dreadthorn"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_endoflame"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_entropinnyum"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_exoflame"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_fallen_kanade"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_gourmaryllis"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_heisei_dream"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_hopperhock"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_hopperhock_chibi"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_hyacidus"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_hydroangeas"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_jaded_amaranthus"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_jiyuulia"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_kekimurus"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_loonium"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_manastar"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_marimorphosis"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_marimorphosis_chibi"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_medumone"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_munchdew"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_narslimmus"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_orechid"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_orechid_ignem"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_pollidisiac"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_pure_daisy"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_rafflowsia"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_rannuncarpus"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_rannuncarpus_chibi"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_rosa_arcana"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_shulk_me_not"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_solegnolia"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_solegnolia_chibi"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_spectranthemum"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_spectrolus"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_tangleberrie"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_thermalily"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_tigerseye"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/floating_vinculotus"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/gray_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/green_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/light_blue_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/light_gray_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/lime_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/magenta_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/orange_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/pink_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/purple_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/red_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/white_floating_flower"
}
}
}
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "botania:block/yellow_floating_flower"
}
}
}
@@ -66,9 +66,6 @@ public class BlockstateProvider extends BlockStateProvider {
.filter(b -> LibMisc.MOD_ID.equals(Registry.BLOCK.getKey(b).getNamespace()))
.collect(Collectors.toSet());
// Handled by FloatingFlowerModelProvider
remainingBlocks.removeIf(b -> b instanceof BlockFloatingFlower);
// Manually written blockstate + models
remainingBlocks.remove(ghostRail);
remainingBlocks.remove(solidVines);
@@ -408,6 +405,11 @@ public class BlockstateProvider extends BlockStateProvider {
simpleBlock(b, model);
});
takeAll(remainingBlocks, b -> b instanceof BlockFloatingFlower).forEach(b -> {
String name = Registry.BLOCK.getKey(b).getPath();
simpleBlock(b, models().getExistingFile(prefix("block/" + name)));
});
takeAll(remainingBlocks, b -> b instanceof PaneBlock).forEach(b -> {
String name = Registry.BLOCK.getKey(b).getPath();
ResourceLocation edge = prefix("block/" + name);
@@ -30,8 +30,8 @@ public class DataGenerators {
evt.getGenerator().addProvider(new RuneProvider(evt.getGenerator()));
}
if (evt.includeClient()) {
evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper()));
evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper()));
evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper()));
evt.getGenerator().addProvider(new ItemModelProvider(evt.getGenerator(), evt.getExistingFileHelper()));
}
}
@@ -10,7 +10,7 @@
"to": [ 16, 3, 16 ],
"faces": {
"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#up" },
"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" },
"north": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" },
"south": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" },
"west": { "uv": [ 0, 13, 16, 16 ], "texture": "#side" },