mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 11:05:40 +00:00
Introduce custom loader additions to the model data generators. (#7450)
Currently implemented loaders: * OBJ * Composite * Multi-layer * Item layers (vanilla item/generated but with fullbright texture support) * Bucket * Separate Perspective
This commit is contained in:
1 parent
cf3e9d1e0c
commit
fed7beab89
18 files changed
+660
-20
No files matched your search
@@ -26,13 +26,11 @@ import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.model.IModelTransform;
|
||||
import net.minecraft.client.renderer.model.IUnbakedModel;
|
||||
import net.minecraft.client.renderer.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.model.RenderMaterial;
|
||||
import net.minecraft.client.renderer.model.*;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormatElement;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.inventory.EquipmentSlotType;
|
||||
import net.minecraft.item.*;
|
||||
@@ -50,12 +48,18 @@ import net.minecraftforge.client.model.IModelBuilder;
|
||||
import net.minecraftforge.client.model.IModelConfiguration;
|
||||
import net.minecraftforge.client.model.IModelLoader;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.client.model.generators.BlockStateProvider;
|
||||
import net.minecraftforge.client.model.generators.ItemModelProvider;
|
||||
import net.minecraftforge.client.model.generators.loaders.ItemLayersModelBuilder;
|
||||
import net.minecraftforge.client.model.generators.loaders.OBJLoaderBuilder;
|
||||
import net.minecraftforge.client.model.generators.loaders.SeparatePerspectiveModelBuilder;
|
||||
import net.minecraftforge.client.model.geometry.ISimpleModelGeometry;
|
||||
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
|
||||
import net.minecraftforge.common.data.ExistingFileHelper;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fml.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
|
||||
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
@@ -136,6 +140,7 @@ public class NewModelLoaderTest
|
||||
ITEMS.register(modEventBus);
|
||||
|
||||
modEventBus.addListener(this::modelRegistry);
|
||||
modEventBus.addListener(this::datagen);
|
||||
}
|
||||
|
||||
public void modelRegistry(ModelRegistryEvent event)
|
||||
@@ -209,4 +214,64 @@ public class NewModelLoaderTest
|
||||
return Collections.singleton(owner.resolveTexture("particle"));
|
||||
}
|
||||
}
|
||||
|
||||
private void datagen(GatherDataEvent event)
|
||||
{
|
||||
DataGenerator gen = event.getGenerator();
|
||||
|
||||
if (event.includeClient())
|
||||
{
|
||||
// Let blockstate provider see generated item models by passing its existing file helper
|
||||
ItemModelProvider itemModels = new ItemModels(gen, event.getExistingFileHelper());
|
||||
gen.addProvider(itemModels);
|
||||
gen.addProvider(new BlockStates(gen, itemModels.existingFileHelper));
|
||||
}
|
||||
}
|
||||
|
||||
public static class ItemModels extends ItemModelProvider
|
||||
{
|
||||
public ItemModels(DataGenerator generator, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
super(generator, MODID, existingFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerModels()
|
||||
{
|
||||
withExistingParent(NewModelLoaderTest.item_layers.getId().getPath(), "forge:item/default")
|
||||
.texture("layer0", "minecraft:item/coal")
|
||||
.texture("layer1", "minecraft:item/stick")
|
||||
.customLoader(ItemLayersModelBuilder::begin)
|
||||
.fullbright(1)
|
||||
.end();
|
||||
withExistingParent(NewModelLoaderTest.separate_perspective.getId().getPath(), "forge:item/default")
|
||||
.customLoader(SeparatePerspectiveModelBuilder::begin)
|
||||
.base(nested().parent(getExistingFile(mcLoc("minecraft:item/coal"))))
|
||||
.perspective(ItemCameraTransforms.TransformType.GUI, nested().parent(getExistingFile(mcLoc("minecraft:item/snowball"))))
|
||||
.perspective(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, nested().parent(getExistingFile(mcLoc("minecraft:item/bone"))))
|
||||
.end();
|
||||
}
|
||||
}
|
||||
|
||||
public static class BlockStates extends BlockStateProvider
|
||||
{
|
||||
public BlockStates(DataGenerator gen, ExistingFileHelper exFileHelper)
|
||||
{
|
||||
super(gen, MODID, exFileHelper);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void registerStatesAndModels()
|
||||
{
|
||||
simpleBlock(NewModelLoaderTest.obj_block.get(), models()
|
||||
.getBuilder(NewModelLoaderTest.obj_block.getId().getPath())
|
||||
.customLoader(OBJLoaderBuilder::begin)
|
||||
.modelLocation(new ResourceLocation("new_model_loader_test:models/item/sugar_glider.obj"))
|
||||
.flipV(true)
|
||||
.end()
|
||||
.texture("qr", "minecraft:block/oak_planks")
|
||||
.texture("particle", "#qr")
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user