mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
Fix CompositeModel not respecting "display" transforms.
Remove leftovers from discarded feature.
This commit is contained in:
1 parent
ecb56054bc
commit
ca031ca33f
5 files changed
+36
-211
No files matched your search
@@ -98,37 +98,5 @@ public class NewModelLoaderTest
|
||||
|
||||
BLOCKS.register(modEventBus);
|
||||
ITEMS.register(modEventBus);
|
||||
|
||||
/*DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
|
||||
MinecraftForge.EVENT_BUS.addListener(this::renderGuiOverlay);
|
||||
});*/
|
||||
}
|
||||
|
||||
/*
|
||||
private NonNullLazy<IRenderable.Configured<?>> modelRenderer = NonNullLazy.of(() -> {
|
||||
OBJModel model = OBJLoader.INSTANCE.loadModel(new ResourceLocation("new_model_loader_test", "models/item/sugar_glider.obj"), false, false, true, false);
|
||||
return IRenderable.withParameter(model.bakeRenderable(ModelLoader.defaultTextureGetter()), null);
|
||||
});
|
||||
|
||||
private NonNullLazy<BakedModelRenderable> modelRenderer2 = NonNullLazy.of(() -> {
|
||||
return BakedModelRenderable.of(new ItemStack(Items.COAL));
|
||||
});
|
||||
|
||||
public void renderGuiOverlay(RenderGameOverlayEvent.Post event)
|
||||
{
|
||||
if (event.getType() == RenderGameOverlayEvent.ElementType.ALL)
|
||||
{
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translatef(event.getWindow().getScaledWidth() / 2.0f, event.getWindow().getScaledHeight() / 2.0f, 200);
|
||||
RenderSystem.scalef(16,16,16);
|
||||
//mc.getItemRenderer().renderItemAndEffectIntoGUI(new ItemStack(Items.COAL),0,0);
|
||||
modelRenderer.get().render();
|
||||
RenderSystem.translatef(1,1,1);
|
||||
modelRenderer2.get().render(new BakedModelRenderable.Context().withPerspective(ItemCameraTransforms.TransformType.GUI).withStack(new ItemStack(Items.COAL)));
|
||||
RenderSystem.popMatrix();
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"parent": "forge:item/default",
|
||||
"loader": "forge:composite",
|
||||
"models": [
|
||||
{
|
||||
"loader": "...",
|
||||
"transform": {}
|
||||
},
|
||||
{
|
||||
"loader": "...",
|
||||
"transform": {}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -16,39 +16,34 @@
|
||||
},
|
||||
"display": {
|
||||
"gui": {
|
||||
"rotation": [ 30, 45, 0 ],
|
||||
"translation": [ 0, 3, 0 ],
|
||||
"scale": [ 1, 1, 1 ]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [ 22, 180, 0 ],
|
||||
"translation": [ 0, 4, 0],
|
||||
"scale":[ 1, 1, 1 ]
|
||||
"rotation": [ 30, 225, 0 ],
|
||||
"translation": [ 0, 0, 0],
|
||||
"scale":[ 0.625, 1.625, 0.625 ]
|
||||
},
|
||||
"ground": {
|
||||
"rotation": [ 0, 0, 0 ],
|
||||
"translation": [ 0, 3, 0 ],
|
||||
"scale": [ 0.5, 0.5, 0.5 ]
|
||||
"translation": [ 0, 3, 0],
|
||||
"scale":[ 0.25, 0.25, 0.25 ]
|
||||
},
|
||||
"head": {
|
||||
"rotation": [ 0, 180, 0 ],
|
||||
"translation": [ 0, 5, 0 ],
|
||||
"scale":[ 1.5, 1.5, 1.5 ]
|
||||
"fixed": {
|
||||
"rotation": [ 0, 0, 0 ],
|
||||
"translation": [ 0, 0, 0],
|
||||
"scale":[ 0.5, 0.5, 0.5 ]
|
||||
},
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [ 45, 45, 0 ],
|
||||
"translation": [ 0, 3, 0 ],
|
||||
"scale": [ 0.5, 0.5, 0.5 ]
|
||||
}
|
||||
},
|
||||
"transform": {
|
||||
"rotation": [ 75, 45, 0 ],
|
||||
"translation": [ 0, 2.5, 0],
|
||||
"scale": [ 0.375, 0.375, 0.375 ]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"scale": 2.0,
|
||||
"translation": [0,0.5,0]
|
||||
"rotation": [ 0, 45, 0 ],
|
||||
"translation": [ 0, 0, 0 ],
|
||||
"scale": [ 0.40, 0.40, 0.40 ]
|
||||
},
|
||||
"firstperson_lefthand": {
|
||||
"scale": 0.5,
|
||||
"translation": [0,1.5,1.5]
|
||||
"rotation": [ 0, 225, 0 ],
|
||||
"translation": [ 0, 0, 0 ],
|
||||
"scale": [ 0.40, 0.40, 0.40 ]
|
||||
}
|
||||
},
|
||||
"visibility": {
|
||||
|
||||
Reference in new issue
Block a user