[#133] Added second flare to test model

src/main/java/net/landofrails/landofsignals/LOSBlocks.java

@@ -113,9 +113,13 @@ public static void register() {
 
         ContentPackSignalPart light_flare = new ContentPackSignalPart("block_signal_part_light_flare", "Ampel (Off, Red)", "models/block/landofsignals/light_flare/lightflare.obj", new float[]{0.5f, 0f, 0.5f}, new float[]{0.5f, 0f, 0.5f}, new float[]{1f, 1f, 1f}, new String[]{
                 "",
+                "yellow",
                 "red"
         });
-        light_flare.setFlares(new Flare[]{new Flare("lightflare_1", "165;32;25", 2f, false, new String[]{"red"})});
+        light_flare.setFlares(new Flare[]{
+                new Flare("lightflare_1", "165;32;25", 2f, false, new String[]{"red"}),
+                new Flare("lightflare_2", "229;189;1", 2f, false, new String[]{"yellow"})
+        });
         registerSignalContentPack(light_flare);
 
         // Animated Signals

src/main/resources/assets/landofsignals/models/block/landofsignals/light_flare/lightflare.obj

@@ -4068,12 +4068,96 @@ v 0.12500000000000008 0.375 0.725
 v 0.12500000000000006 0.375 0.6625
 v 0.12500000000000008 0.125 0.725
 v 0.12500000000000006 0.125 0.6625
+vt 0 1
+vt 0 0.75
+vt 0.0625 1
+vt 0 0.75
+vt 0.0625 0.75
+vt 0.0625 1
+vt 0 1
+vt 0 0.75
+vt 0.0625 1
+vt 0 0.75
+vt 0.0625 0.75
+vt 0.0625 1
+vt 0 1
+vt 0 0.9375
+vt 0.25 1
+vt 0 0.9375
+vt 0.25 0.9375
+vt 0.25 1
+vt 0 1
+vt 0 0.9375
+vt 0.25 1
+vt 0 0.9375
+vt 0.25 0.9375
+vt 0.25 1
+vt 0 1
+vt 0 0.75
+vt 0.25 1
+vt 0 0.75
+vt 0.25 0.75
+vt 0.25 1
+vt 0 1
+vt 0 0.75
+vt 0.25 1
+vt 0 0.75
+vt 0.25 0.75
+vt 0.25 1
+vn -1 0 1.2246467991473532e-16
+vn -1 0 1.2246467991473532e-16
+vn -1 0 1.2246467991473532e-16
+vn -1 0 1.2246467991473532e-16
+vn -1 0 1.2246467991473532e-16
+vn -1 0 1.2246467991473532e-16
+vn 1 0 -1.2246467991473532e-16
+vn 1 0 -1.2246467991473532e-16
+vn 1 0 -1.2246467991473532e-16
+vn 1 0 -1.2246467991473532e-16
+vn 1 0 -1.2246467991473532e-16
+vn 1 0 -1.2246467991473532e-16
+vn 0 1 0
+vn 0 1 0
+vn 0 1 0
+vn 0 1 0
+vn 0 1 0
+vn 0 1 0
 vn 0 -1 0
 vn 0 -1 0
 vn 0 -1 0
 vn 0 -1 0
 vn 0 -1 0
 vn 0 -1 0
+vn -1.2246467991473532e-16 0 -1
+vn -1.2246467991473532e-16 0 -1
+vn -1.2246467991473532e-16 0 -1
+vn -1.2246467991473532e-16 0 -1
+vn -1.2246467991473532e-16 0 -1
+vn -1.2246467991473532e-16 0 -1
+vn 1.2246467991473532e-16 0 1
+vn 1.2246467991473532e-16 0 1
+vn 1.2246467991473532e-16 0 1
+vn 1.2246467991473532e-16 0 1
+vn 1.2246467991473532e-16 0 1
+vn 1.2246467991473532e-16 0 1
+usemtl m_5
+f 329/1477/1477 331/1478/1478 330/1479/1479
+f 331/1480/1480 332/1481/1481 330/1482/1482
+usemtl m_5
+f 333/1483/1483 335/1484/1484 334/1485/1485
+f 335/1486/1486 336/1487/1487 334/1488/1488
+usemtl m_5
+f 333/1489/1489 334/1490/1490 330/1491/1491
+f 334/1492/1492 329/1493/1493 330/1494/1494
+usemtl m_5
+f 336/1495/1495 335/1496/1496 331/1497/1497
+f 335/1498/1498 332/1499/1499 331/1500/1500
+usemtl m_5
+f 334/1501/1501 336/1502/1502 329/1503/1503
+f 336/1504/1504 331/1505/1505 329/1506/1506
+usemtl m_5
+f 330/1507/1507 332/1508/1508 333/1509/1509
+f 332/1510/1510 335/1511/1511 333/1512/1512
 o rod
 v 0.046875 1.0625 0.5625
 v 0.046875 1.0625 0.125
@@ -4156,23 +4240,23 @@ vn 0 0 -1
 vn 0 0 -1
 vn 0 0 -1
 usemtl m_6
-f 337/1477/1483 339/1478/1484 338/1479/1485
-f 339/1480/1486 340/1481/1487 338/1482/1488
+f 337/1513/1513 339/1514/1514 338/1515/1515
+f 339/1516/1516 340/1517/1517 338/1518/1518
 usemtl m_6
-f 341/1483/1489 343/1484/1490 342/1485/1491
-f 343/1486/1492 344/1487/1493 342/1488/1494
+f 341/1519/1519 343/1520/1520 342/1521/1521
+f 343/1522/1522 344/1523/1523 342/1524/1524
 usemtl m_6
-f 341/1489/1495 342/1490/1496 338/1491/1497
-f 342/1492/1498 337/1493/1499 338/1494/1500
+f 341/1525/1525 342/1526/1526 338/1527/1527
+f 342/1528/1528 337/1529/1529 338/1530/1530
 usemtl m_6
-f 344/1495/1501 343/1496/1502 339/1497/1503
-f 343/1498/1504 340/1499/1505 339/1500/1506
+f 344/1531/1531 343/1532/1532 339/1533/1533
+f 343/1534/1534 340/1535/1535 339/1536/1536
 usemtl m_6
-f 342/1501/1507 344/1502/1508 337/1503/1509
-f 344/1504/1510 339/1505/1511 337/1506/1512
+f 342/1537/1537 344/1538/1538 337/1539/1539
+f 344/1540/1540 339/1541/1541 337/1542/1542
 usemtl m_6
-f 338/1507/1513 340/1508/1514 341/1509/1515
-f 340/1510/1516 343/1511/1517 341/1512/1518
+f 338/1543/1543 340/1544/1544 341/1545/1545
+f 340/1546/1546 343/1547/1547 341/1548/1548
 o connector
 v 0.09375 1.0625 0.59375
 v 0.09375 1.0625 0.40625
@@ -4255,23 +4339,23 @@ vn 0 0 -1
 vn 0 0 -1
 vn 0 0 -1
 usemtl m_6
-f 345/1513/1519 347/1514/1520 346/1515/1521
-f 347/1516/1522 348/1517/1523 346/1518/1524
+f 345/1549/1549 347/1550/1550 346/1551/1551
+f 347/1552/1552 348/1553/1553 346/1554/1554
 usemtl m_6
-f 349/1519/1525 351/1520/1526 350/1521/1527
-f 351/1522/1528 352/1523/1529 350/1524/1530
+f 349/1555/1555 351/1556/1556 350/1557/1557
+f 351/1558/1558 352/1559/1559 350/1560/1560
 usemtl m_6
-f 349/1525/1531 350/1526/1532 346/1527/1533
-f 350/1528/1534 345/1529/1535 346/1530/1536
+f 349/1561/1561 350/1562/1562 346/1563/1563
+f 350/1564/1564 345/1565/1565 346/1566/1566
 usemtl m_6
-f 352/1531/1537 351/1532/1538 347/1533/1539
-f 351/1534/1540 348/1535/1541 347/1536/1542
+f 352/1567/1567 351/1568/1568 347/1569/1569
+f 351/1570/1570 348/1571/1571 347/1572/1572
 usemtl m_6
-f 350/1537/1543 352/1538/1544 345/1539/1545
-f 352/1540/1546 347/1541/1547 345/1542/1548
+f 350/1573/1573 352/1574/1574 345/1575/1575
+f 352/1576/1576 347/1577/1577 345/1578/1578
 usemtl m_6
-f 346/1543/1549 348/1544/1550 349/1545/1551
-f 348/1546/1552 351/1547/1553 349/1548/1554
+f 346/1579/1579 348/1580/1580 349/1581/1581
+f 348/1582/1582 351/1583/1583 349/1584/1584
 o rod
 v 0.046875 0 0.5625
 v 0.046875 0 0.125
@@ -4354,23 +4438,23 @@ vn 0 0 -1
 vn 0 0 -1
 vn 0 0 -1
 usemtl m_6
-f 353/1549/1555 355/1550/1556 354/1551/1557
-f 355/1552/1558 356/1553/1559 354/1554/1560
+f 353/1585/1585 355/1586/1586 354/1587/1587
+f 355/1588/1588 356/1589/1589 354/1590/1590
 usemtl m_6
-f 357/1555/1561 359/1556/1562 358/1557/1563
-f 359/1558/1564 360/1559/1565 358/1560/1566
+f 357/1591/1591 359/1592/1592 358/1593/1593
+f 359/1594/1594 360/1595/1595 358/1596/1596
 usemtl m_6
-f 357/1561/1567 358/1562/1568 354/1563/1569
-f 358/1564/1570 353/1565/1571 354/1566/1572
+f 357/1597/1597 358/1598/1598 354/1599/1599
+f 358/1600/1600 353/1601/1601 354/1602/1602
 usemtl m_6
-f 360/1567/1573 359/1568/1574 355/1569/1575
-f 359/1570/1576 356/1571/1577 355/1572/1578
+f 360/1603/1603 359/1604/1604 355/1605/1605
+f 359/1606/1606 356/1607/1607 355/1608/1608
 usemtl m_6
-f 358/1573/1579 360/1574/1580 353/1575/1581
-f 360/1576/1582 355/1577/1583 353/1578/1584
+f 358/1609/1609 360/1610/1610 353/1611/1611
+f 360/1612/1612 355/1613/1613 353/1614/1614
 usemtl m_6
-f 354/1579/1585 356/1580/1586 357/1581/1587
-f 356/1582/1588 359/1583/1589 357/1584/1590
+f 354/1615/1615 356/1616/1616 357/1617/1617
+f 356/1618/1618 359/1619/1619 357/1620/1620
 o connector
 v 0.09375 0 0.59375
 v 0.09375 0 0.40625
@@ -4453,23 +4537,23 @@ vn 0 0 -1
 vn 0 0 -1
 vn 0 0 -1
 usemtl m_6
-f 361/1585/1591 363/1586/1592 362/1587/1593
-f 363/1588/1594 364/1589/1595 362/1590/1596
+f 361/1621/1621 363/1622/1622 362/1623/1623
+f 363/1624/1624 364/1625/1625 362/1626/1626
 usemtl m_6
-f 365/1591/1597 367/1592/1598 366/1593/1599
-f 367/1594/1600 368/1595/1601 366/1596/1602
+f 365/1627/1627 367/1628/1628 366/1629/1629
+f 367/1630/1630 368/1631/1631 366/1632/1632
 usemtl m_6
-f 365/1597/1603 366/1598/1604 362/1599/1605
-f 366/1600/1606 361/1601/1607 362/1602/1608
+f 365/1633/1633 366/1634/1634 362/1635/1635
+f 366/1636/1636 361/1637/1637 362/1638/1638
 usemtl m_6
-f 368/1603/1609 367/1604/1610 363/1605/1611
-f 367/1606/1612 364/1607/1613 363/1608/1614
+f 368/1639/1639 367/1640/1640 363/1641/1641
+f 367/1642/1642 364/1643/1643 363/1644/1644
 usemtl m_6
-f 366/1609/1615 368/1610/1616 361/1611/1617
-f 368/1612/1618 363/1613/1619 361/1614/1620
+f 366/1645/1645 368/1646/1646 361/1647/1647
+f 368/1648/1648 363/1649/1649 361/1650/1650
 usemtl m_6
-f 362/1615/1621 364/1616/1622 365/1617/1623
-f 364/1618/1624 367/1619/1625 365/1620/1626
+f 362/1651/1651 364/1652/1652 365/1653/1653
+f 364/1654/1654 367/1655/1655 365/1656/1656
 o cube
 v 0.05171875 1.125 0.125
 v 0.05171875 1.125 -0.125
@@ -4552,23 +4636,23 @@ vn 0 0 -1
 vn 0 0 -1
 vn 0 0 -1
 usemtl m_6
-f 369/1621/1627 371/1622/1628 370/1623/1629
-f 371/1624/1630 372/1625/1631 370/1626/1632
+f 369/1657/1657 371/1658/1658 370/1659/1659
+f 371/1660/1660 372/1661/1661 370/1662/1662
 usemtl m_6
-f 373/1627/1633 375/1628/1634 374/1629/1635
-f 375/1630/1636 376/1631/1637 374/1632/1638
+f 373/1663/1663 375/1664/1664 374/1665/1665
+f 375/1666/1666 376/1667/1667 374/1668/1668
 usemtl m_6
-f 373/1633/1639 374/1634/1640 370/1635/1641
-f 374/1636/1642 369/1637/1643 370/1638/1644
+f 373/1669/1669 374/1670/1670 370/1671/1671
+f 374/1672/1672 369/1673/1673 370/1674/1674
 usemtl m_6
-f 376/1639/1645 375/1640/1646 371/1641/1647
-f 375/1642/1648 372/1643/1649 371/1644/1650
+f 376/1675/1675 375/1676/1676 371/1677/1677
+f 375/1678/1678 372/1679/1679 371/1680/1680
 usemtl m_6
-f 374/1645/1651 376/1646/1652 369/1647/1653
-f 376/1648/1654 371/1649/1655 369/1650/1656
+f 374/1681/1681 376/1682/1682 369/1683/1683
+f 376/1684/1684 371/1685/1685 369/1686/1686
 usemtl m_6
-f 370/1651/1657 372/1652/1658 373/1653/1659
-f 372/1654/1660 375/1655/1661 373/1656/1662
+f 370/1687/1687 372/1688/1688 373/1689/1689
+f 372/1690/1690 375/1691/1691 373/1692/1692
 o cube
 v 0.125 1.125 0.05171875
 v 0.125 1.125 -0.05171875
@@ -4651,23 +4735,23 @@ vn 0 0 -1
 vn 0 0 -1
 vn 0 0 -1
 usemtl m_6
-f 377/1657/1663 379/1658/1664 378/1659/1665
-f 379/1660/1666 380/1661/1667 378/1662/1668
+f 377/1693/1693 379/1694/1694 378/1695/1695
+f 379/1696/1696 380/1697/1697 378/1698/1698
 usemtl m_6
-f 381/1663/1669 383/1664/1670 382/1665/1671
-f 383/1666/1672 384/1667/1673 382/1668/1674
+f 381/1699/1699 383/1700/1700 382/1701/1701
+f 383/1702/1702 384/1703/1703 382/1704/1704
 usemtl m_6
-f 381/1669/1675 382/1670/1676 378/1671/1677
-f 382/1672/1678 377/1673/1679 378/1674/1680
+f 381/1705/1705 382/1706/1706 378/1707/1707
+f 382/1708/1708 377/1709/1709 378/1710/1710
 usemtl m_6
-f 384/1675/1681 383/1676/1682 379/1677/1683
-f 383/1678/1684 380/1679/1685 379/1680/1686
+f 384/1711/1711 383/1712/1712 379/1713/1713
+f 383/1714/1714 380/1715/1715 379/1716/1716
 usemtl m_6
-f 382/1681/1687 384/1682/1688 377/1683/1689
-f 384/1684/1690 379/1685/1691 377/1686/1692
+f 382/1717/1717 384/1718/1718 377/1719/1719
+f 384/1720/1720 379/1721/1721 377/1722/1722
 usemtl m_6
-f 378/1687/1693 380/1688/1694 381/1689/1695
-f 380/1690/1696 383/1691/1697 381/1692/1698
+f 378/1723/1723 380/1724/1724 381/1725/1725
+f 380/1726/1726 383/1727/1727 381/1728/1728
 o cube
 v 0.1249590264878102 1.125 0.051817668808826677
 v -0.0518176688088267 1.125 -0.12495902648781018
@@ -4750,23 +4834,23 @@ vn -0.7071067811865476 0 -0.7071067811865475
 vn -0.7071067811865476 0 -0.7071067811865475
 vn -0.7071067811865476 0 -0.7071067811865475
 usemtl m_6
-f 385/1693/1699 387/1694/1700 386/1695/1701
-f 387/1696/1702 388/1697/1703 386/1698/1704
+f 385/1729/1729 387/1730/1730 386/1731/1731
+f 387/1732/1732 388/1733/1733 386/1734/1734
 usemtl m_6
-f 389/1699/1705 391/1700/1706 390/1701/1707
-f 391/1702/1708 392/1703/1709 390/1704/1710
+f 389/1735/1735 391/1736/1736 390/1737/1737
+f 391/1738/1738 392/1739/1739 390/1740/1740
 usemtl m_6
-f 389/1705/1711 390/1706/1712 386/1707/1713
-f 390/1708/1714 385/1709/1715 386/1710/1716
+f 389/1741/1741 390/1742/1742 386/1743/1743
+f 390/1744/1744 385/1745/1745 386/1746/1746
 usemtl m_6
-f 392/1711/1717 391/1712/1718 387/1713/1719
-f 391/1714/1720 388/1715/1721 387/1716/1722
+f 392/1747/1747 391/1748/1748 387/1749/1749
+f 391/1750/1750 388/1751/1751 387/1752/1752
 usemtl m_6
-f 390/1717/1723 392/1718/1724 385/1719/1725
-f 392/1720/1726 387/1721/1727 385/1722/1728
+f 390/1753/1753 392/1754/1754 385/1755/1755
+f 392/1756/1756 387/1757/1757 385/1758/1758
 usemtl m_6
-f 386/1723/1729 388/1724/1730 389/1725/1731
-f 388/1726/1732 391/1727/1733 389/1728/1734
+f 386/1759/1759 388/1760/1760 389/1761/1761
+f 388/1762/1762 391/1763/1763 389/1764/1764
 o cube
 v 0.12495902648781018 1.125 -0.0518176688088267
 v 0.051817668808826677 1.125 -0.1249590264878102
@@ -4849,20 +4933,20 @@ vn -0.7071067811865476 0 -0.7071067811865475
 vn -0.7071067811865476 0 -0.7071067811865475
 vn -0.7071067811865476 0 -0.7071067811865475
 usemtl m_6
-f 393/1729/1735 395/1730/1736 394/1731/1737
-f 395/1732/1738 396/1733/1739 394/1734/1740
+f 393/1765/1765 395/1766/1766 394/1767/1767
+f 395/1768/1768 396/1769/1769 394/1770/1770
 usemtl m_6
-f 397/1735/1741 399/1736/1742 398/1737/1743
-f 399/1738/1744 400/1739/1745 398/1740/1746
+f 397/1771/1771 399/1772/1772 398/1773/1773
+f 399/1774/1774 400/1775/1775 398/1776/1776
 usemtl m_6
-f 397/1741/1747 398/1742/1748 394/1743/1749
-f 398/1744/1750 393/1745/1751 394/1746/1752
+f 397/1777/1777 398/1778/1778 394/1779/1779
+f 398/1780/1780 393/1781/1781 394/1782/1782
 usemtl m_6
-f 400/1747/1753 399/1748/1754 395/1749/1755
-f 399/1750/1756 396/1751/1757 395/1752/1758
+f 400/1783/1783 399/1784/1784 395/1785/1785
+f 399/1786/1786 396/1787/1787 395/1788/1788
 usemtl m_6
-f 398/1753/1759 400/1754/1760 393/1755/1761
-f 400/1756/1762 395/1757/1763 393/1758/1764
+f 398/1789/1789 400/1790/1790 393/1791/1791
+f 400/1792/1792 395/1793/1793 393/1794/1794
 usemtl m_6
-f 394/1759/1765 396/1760/1766 397/1761/1767
-f 396/1762/1768 399/1763/1769 397/1764/1770
+f 394/1795/1795 396/1796/1796 397/1797/1797
+f 396/1798/1798 399/1799/1799 397/1800/1800