Merge branch 'improvedfloaters'

This commit is contained in:
Vincent Lee committed 2016-08-19 19:53:47 -05:00
commit a9171cd215
14 files changed
+187 -3

No files matched your search

@@ -209,8 +209,10 @@ public class SpecialFlowerModel implements IModelCustomData {
@Nonnull
@Override
public List<BakedQuad> getQuads(IBlockState state, EnumFacing face, long rand) {
if(state.getBlock() != ModBlocks.specialFlower)
if(state.getBlock() != ModBlocks.specialFlower) {
Botania.LOGGER.fatal("FOREIGN BLOCK: " + state);
return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand);
}
IExtendedBlockState extendedState = ((IExtendedBlockState) state);
String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID);
@@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "botania:miniIsland"
"model": "botania:miniIsland_new"
},
"variants": {
"variant": {
@@ -296,4 +296,4 @@
}
}
]
}
}
@@ -0,0 +1,182 @@
{
"__comment": "Author: wiiv",
"parent": "minecraft:block/block",
"display": {
"gui": {
"rotation": [ 30, 225, 0 ],
"translation": [ 0, 0, 0],
"scale":[ 0.75, 0.75, 0.75 ]
}
},
"elements": [
{
"name": "Layer1",
"from": [ 3.0, 6.0, 3.0 ],
"to": [ 13.0, 7.0, 13.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 0.0, 6.0, 5.0, 6.5 ] },
"south": { "texture": "#all", "uv": [ 6.0, 6.0, 11.0, 6.5 ] },
"west": { "texture": "#all", "uv": [ 0.0, 9.5, 5.0, 10.0 ] },
"east": { "texture": "#all", "uv": [ 6.0, 9.5, 11.0, 10.0 ] },
"up": { "texture": "#all", "uv": [ 0.0, 0.0, 5.0, 5.0 ] },
"down": { "texture": "#all", "uv": [ 6.0, 0.0, 11.0, 5.0 ] }
}
},
{
"name": "Layer2North",
"from": [ 5.0, 5.0, 3.0 ],
"to": [ 11.0, 6.0, 5.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 1.0, 6.5, 4.0, 7.0 ] },
"east": { "texture": "#all", "uv": [ 10.0, 10.0, 11.0, 10.5 ] },
"west": { "texture": "#all", "uv": [ 0.0, 10.0, 1.0, 10.5 ] },
"down": { "texture": "#all", "uv": [ 7.0, 4.0, 10.0, 5.0 ] }
}
},
{
"name": "Layer2South",
"from": [ 5.0, 5.0, 11.0 ],
"to": [ 11.0, 6.0, 13.0 ],
"faces": {
"east": { "texture": "#all", "uv": [ 6.0, 10.0, 7.0, 10.5 ] },
"south": { "texture": "#all", "uv": [ 7.0, 6.5, 10.0, 7.0 ] },
"west": { "texture": "#all", "uv": [ 4.0, 10.0, 5.0, 10.5 ] },
"down": { "texture": "#all", "uv": [ 7.0, 0.0, 10.0, 1.0 ] }
}
},
{
"name": "Layer2West",
"from": [ 3.0, 5.0, 5.0 ],
"to": [ 5.0, 6.0, 11.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 4.0, 6.5, 5.0, 7.0 ] },
"south": { "texture": "#all", "uv": [ 6.0, 6.5, 7.0, 7.0 ] },
"west": { "texture": "#all", "uv": [ 1.0, 10.0, 4.0, 10.5 ] },
"down": { "texture": "#all", "uv": [ 6.0, 1.0, 7.0, 4.0 ] }
}
},
{
"name": "Layer2East",
"from": [ 11.0, 5.0, 5.0 ],
"to": [ 13.0, 6.0, 11.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 0.0, 6.5, 1.0, 7.0 ] },
"east": { "texture": "#all", "uv": [ 7.0, 10.0, 10.0, 10.5 ] },
"south": { "texture": "#all", "uv": [ 10.0, 6.5, 11.0, 7.0 ] },
"down": { "texture": "#all", "uv": [ 10.0, 1.0, 11.0, 4.0 ] }
}
},
{
"name": "Layer3Center",
"from": [ 5.0, 4.0, 5.0 ],
"to": [ 11.0, 5.0, 11.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 1.0, 7.0, 4.0, 7.5 ] },
"south": { "texture": "#all", "uv": [ 7.0, 7.0, 10.0, 7.5 ] },
"west": { "texture": "#all", "uv": [ 1.0, 10.5, 4.0, 11.0 ] },
"east": { "texture": "#all", "uv": [ 7.0, 10.5, 10.0, 11.0 ] },
"down": { "texture": "#all", "uv": [ 7.0, 1.0, 10.0, 4.0 ] }
}
},
{
"name": "Layer3North",
"from": [ 7.0, 4.0, 3.0 ],
"to": [ 9.0, 5.0, 5.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 2.0, 7.0, 3.0, 7.5 ] },
"west": { "texture": "#all", "uv": [ 0.0, 10.5, 1.0, 11.0 ] },
"east": { "texture": "#all", "uv": [ 10.0, 10.5, 11.0, 11.0 ] },
"down": { "texture": "#all", "uv": [ 8.0, 4.0, 9.0, 5.0 ] }
}
},
{
"name": "Layer3South",
"from": [ 7.0, 4.0, 11.0 ],
"to": [ 9.0, 5.0, 13.0 ],
"faces": {
"east": { "texture": "#all", "uv": [ 6.0, 10.5, 7.0, 11.0 ] },
"south": { "texture": "#all", "uv": [ 8.0, 7.0, 9.0, 7.5 ] },
"west": { "texture": "#all", "uv": [ 4.0, 10.5, 5.0, 11.0 ] },
"down": { "texture": "#all", "uv": [ 8.0, 0.0, 9.0, 1.0 ] }
}
},
{
"name": "Layer3West",
"from": [ 3.0, 4.0, 7.0 ],
"to": [ 5.0, 5.0, 9.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 4.0, 7.0, 5.0, 7.5 ] },
"south": { "texture": "#all", "uv": [ 0.0, 7.0, 2.0, 7.5 ] },
"west": { "texture": "#all", "uv": [ 2.0, 10.5, 3.0, 11.0 ] },
"down": { "texture": "#all", "uv": [ 6.0, 2.0, 7.0, 3.0 ] }
}
},
{
"name": "Layer3East",
"from": [ 11.0, 4.0, 7.0 ],
"to": [ 13.0, 5.0, 9.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 0.0, 7.0, 1.0, 7.5 ] },
"east": { "texture": "#all", "uv": [ 8.0, 10.5, 9.0, 11.0 ] },
"south": { "texture": "#all", "uv": [ 6.0, 7.0, 7.0, 7.5 ] },
"down": { "texture": "#all", "uv": [ 10.0, 2.0, 11.0, 3.0 ] }
}
},
{
"name": "Layer4North",
"from": [ 7.0, 3.0, 5.0 ],
"to": [ 9.0, 4.0, 7.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 2.0, 7.5, 3.0, 8.0 ] },
"east": { "texture": "#all", "uv": [ 9.0, 11.0, 10.0, 11.5 ] },
"west": { "texture": "#all", "uv": [ 1.0, 11.0, 2.0, 11.5 ] },
"down": { "texture": "#all", "uv": [ 8.0, 3.0, 9.0, 4.0 ] }
}
},
{
"name": "Layer4South",
"from": [ 7.0, 3.0, 9.0 ],
"to": [ 9.0, 4.0, 11.0 ],
"faces": {
"east": { "texture": "#all", "uv": [ 7.0, 11.0, 8.0, 11.5 ] },
"south": { "texture": "#all", "uv": [ 8.0, 7.5, 9.0, 8.0 ] },
"west": { "texture": "#all", "uv": [ 3.0, 11.0, 4.0, 11.5 ] },
"down": { "texture": "#all", "uv": [ 8.0, 1.0, 9.0, 2.0 ] }
}
},
{
"name": "Layer4West",
"from": [ 5.0, 3.0, 7.0 ],
"to": [ 7.0, 4.0, 9.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 3.0, 7.5, 4.0, 8.0 ] },
"south": { "texture": "#all", "uv": [ 7.0, 7.5, 8.0, 8.0 ] },
"west": { "texture": "#all", "uv": [ 2.0, 11.0, 3.0, 11.5 ] },
"down": { "texture": "#all", "uv": [ 7.0, 2.0, 8.0, 3.0 ] }
}
},
{
"name": "Layer4East",
"from": [ 9.0, 3.0, 7.0 ],
"to": [ 11.0, 4.0, 9.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 1.0, 7.5, 2.0, 8.0 ] },
"east": { "texture": "#all", "uv": [ 8.0, 11.0, 9.0, 11.5 ] },
"south": { "texture": "#all", "uv": [ 9.0, 7.5, 10.0, 8.0 ] },
"down": { "texture": "#all", "uv": [ 9.0, 2.0, 10.0, 3.0 ] }
}
},
{
"name": "Layer5",
"from": [ 7.0, 2.0, 7.0 ],
"to": [ 9.0, 3.0, 9.0 ],
"faces": {
"north": { "texture": "#all", "uv": [ 2.0, 8.0, 3.0, 8.5 ] },
"south": { "texture": "#all", "uv": [ 8.0, 8.0, 9.0, 8.5 ] },
"west": { "texture": "#all", "uv": [ 2.0, 11.5, 3.0, 12.0 ] },
"east": { "texture": "#all", "uv": [ 8.0, 11.5, 9.0, 12.0 ] },
"down": { "texture": "#all", "uv": [ 8.0, 2.0, 9.0, 3.0 ] }
}
}
]
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 839 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 833 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 770 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 813 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 858 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 816 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 825 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 605 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 821 B