Datagenerate floating flower blockstates and models

This commit is contained in:
Vincent Lee committed 2020-01-17 22:30:24 -06:00
1 parent 784844914a
commit c509874908
202 files changed
+996 -786

No files matched your search

@@ -98,7 +98,7 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
public final class ModelHandler {
@SubscribeEvent
public static void registerModels(ModelRegistryEvent evt) {
ModelLoaderRegistry.registerLoader(prefix("floating_flower"), FloatingFlowerModel.Loader.INSTANCE);
ModelLoaderRegistry.registerLoader(FloatingFlowerModel.Loader.ID, FloatingFlowerModel.Loader.INSTANCE);
ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":mana_gun_clip", "inventory"));
ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun", "inventory"));
ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun_clip", "inventory"));
@@ -46,6 +46,8 @@ import java.util.Random;
import java.util.Set;
import java.util.function.Function;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
public class FloatingFlowerModel implements IModelGeometry<FloatingFlowerModel> {
private IUnbakedModel unbakedFlower;
private final Map<IFloatingFlower.IslandType, IUnbakedModel> unbakedIslands = new HashMap<>();
@@ -144,6 +146,8 @@ public class FloatingFlowerModel implements IModelGeometry<FloatingFlowerModel>
public enum Loader implements IModelLoader<FloatingFlowerModel> {
INSTANCE;
public static final ResourceLocation ID = prefix("floating_flower");
@Override
public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) {}
@@ -54,8 +54,7 @@ public class BlockstateProvider extends BlockStateProvider {
protected void registerStatesAndModels() {
Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace()))
.forEach(b -> {
if (b instanceof BlockFloatingFlower
|| b == ModBlocks.craftCrate || b == ModBlocks.ghostRail
if (b == ModBlocks.craftCrate || b == ModBlocks.ghostRail
|| b == ModBlocks.solidVines)
return;
@@ -13,6 +13,7 @@ public class DataGenerators {
evt.getGenerator().addProvider(new BlockTagProvider(evt.getGenerator()));
evt.getGenerator().addProvider(new ItemTagProvider(evt.getGenerator()));
evt.getGenerator().addProvider(new StonecuttingProvider(evt.getGenerator()));
evt.getGenerator().addProvider(new FloatingFlowerModelProvider(evt.getGenerator(), evt.getExistingFileHelper()));
evt.getGenerator().addProvider(new BlockstateProvider(evt.getGenerator(), evt.getExistingFileHelper()));
}
}
@@ -0,0 +1,31 @@
package vazkii.botania.data;
import com.google.gson.JsonObject;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.generators.ExistingFileHelper;
import net.minecraftforge.client.model.generators.ModelBuilder;
import net.minecraftforge.client.model.generators.ModelFile;
import vazkii.botania.client.model.FloatingFlowerModel;
public class FloatingFlowerModelBuilder extends ModelBuilder<FloatingFlowerModelBuilder> {
private ModelFile flowerModel;
public FloatingFlowerModelBuilder(ResourceLocation outputLocation, ExistingFileHelper existingFileHelper) {
super(outputLocation, existingFileHelper);
}
public FloatingFlowerModelBuilder withFlowerModel(ModelFile model) {
this.flowerModel = model;
return this;
}
@Override
public JsonObject toJson() {
JsonObject ret = super.toJson();
ret.addProperty("loader", FloatingFlowerModel.Loader.ID.toString());
JsonObject submodel = new JsonObject();
submodel.addProperty("parent", flowerModel.getLocation().toString());
ret.add("flower", submodel);
return ret;
}
}
@@ -0,0 +1,45 @@
package vazkii.botania.data;
import net.minecraft.block.Block;
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.ModelProvider;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
public class FloatingFlowerModelProvider extends ModelProvider<FloatingFlowerModelBuilder> {
public FloatingFlowerModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) {
super(generator, LibMisc.MOD_ID, BLOCK_FOLDER, FloatingFlowerModelBuilder::new, existingFileHelper);
}
@Override
protected void registerModels() {
for (Block b : Registry.BLOCK) {
if (LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace()) && b instanceof BlockFloatingFlower) {
String name = b.getRegistryName().getPath();
String nonFloat;
if (name.endsWith("_floating_flower")) {
nonFloat = name.replace("_floating_flower", "_mystical_flower");
} else {
nonFloat = name.replace("floating_", "");
}
getBuilder(name)
.parent(getExistingFile(new ResourceLocation("block/block")))
.withFlowerModel(getExistingFile(prefix(nonFloat)));
}
}
}
@Nonnull
@Override
public String getName() {
return "Botania floating flower models";
}
}