diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityCraneBoxer.java b/src/main/java/com/hbm/tileentity/network/TileEntityCraneBoxer.java index 9914612de..bca0a3f22 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityCraneBoxer.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityCraneBoxer.java @@ -89,7 +89,7 @@ public class TileEntityCraneBoxer extends TileEntityMachineBase implements IGUIP this.lastRedstone = redstone; - if(mode != MODE_REDSTONE && worldObj.getTotalWorldTime() % 20 == 0) { + if(mode != MODE_REDSTONE && worldObj.getTotalWorldTime() % 2 == 0) { int pack = 1; switch(mode) { diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityCraneExtractor.java b/src/main/java/com/hbm/tileentity/network/TileEntityCraneExtractor.java index a6f08ce7b..2d0232d60 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityCraneExtractor.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityCraneExtractor.java @@ -56,16 +56,7 @@ public class TileEntityCraneExtractor extends TileEntityMachineBase implements I } } - boolean powered = false; - - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(this.worldObj.isBlockIndirectlyGettingPowered(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ)) { - powered = true; - break; - } - } - - if(worldObj.getTotalWorldTime() % delay == 0 && !powered) { + if(worldObj.getTotalWorldTime() % delay == 0 && !this.worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) { int amount = 1; if(slots[18] != null && slots[18].getItem() == ModItems.upgrade_stack) { diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityCraneUnboxer.java b/src/main/java/com/hbm/tileentity/network/TileEntityCraneUnboxer.java index 68b0c9070..3cd1aa7da 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityCraneUnboxer.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityCraneUnboxer.java @@ -57,7 +57,7 @@ public class TileEntityCraneUnboxer extends TileEntityMachineBase implements IGU if(worldObj.getTotalWorldTime() % delay == 0 && !worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) { int amount = 1; - if(slots[21] != null && slots[18].getItem() == ModItems.upgrade_stack) { + if(slots[21] != null && slots[21].getItem() == ModItems.upgrade_stack) { switch(slots[21].getItemDamage()) { case 0: amount = 4; break; case 1: amount = 16; break; @@ -68,8 +68,6 @@ public class TileEntityCraneUnboxer extends TileEntityMachineBase implements IGU ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata()); Block b = worldObj.getBlock(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ); - boolean hasSent = false; - if(b instanceof IConveyorBelt) { IConveyorBelt belt = (IConveyorBelt) b; @@ -107,6 +105,11 @@ public class TileEntityCraneUnboxer extends TileEntityMachineBase implements IGU return true; } + @Override + public boolean canExtractItem(int i, ItemStack itemStack, int j) { + return true; + } + @Override public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { return new ContainerCraneUnboxer(player.inventory, this); diff --git a/src/main/resources/assets/hbm/models/mobs/horse.obj b/src/main/resources/assets/hbm/models/mobs/horse.obj new file mode 100644 index 000000000..b1183b6d5 --- /dev/null +++ b/src/main/resources/assets/hbm/models/mobs/horse.obj @@ -0,0 +1,963 @@ +# Blender v2.79 (sub 0) OBJ File: 'horse.blend' +# www.blender.org +o LeftWing +v 0.250000 0.937500 0.250000 +v 0.250000 1.062500 0.250000 +v 0.250000 0.937500 -0.125000 +v 0.250000 1.062500 -0.125000 +v 0.250000 1.187500 0.250000 +v 0.250000 1.187500 -0.125000 +v 0.250000 0.812500 0.250000 +v 0.250000 0.812500 -0.125000 +v 0.250000 0.937500 -0.250000 +v 0.250000 1.062500 -0.250000 +v 0.375000 1.062500 0.250000 +v 0.375000 0.937500 0.250000 +v 0.375000 1.062500 -0.125000 +v 0.375000 0.937500 -0.125000 +v 0.375000 1.187500 0.250000 +v 0.375000 1.187500 -0.125000 +v 0.375000 0.812500 -0.125000 +v 0.375000 0.812500 0.250000 +v 0.375000 1.062500 -0.250000 +v 0.375000 0.937500 -0.250000 +vt 0.906250 0.250000 +vt 0.875000 0.437500 +vt 0.906250 0.437500 +vt 0.875000 0.250000 +vt 0.906250 0.437500 +vt 0.906250 0.250000 +vt 0.906250 0.437500 +vt 0.875000 0.250000 +vt 0.875000 0.437500 +vt 0.875000 0.187500 +vt 0.875000 0.250000 +vt 0.968750 0.437500 +vt 1.000000 0.250000 +vt 0.968750 0.250000 +vt 0.968750 0.250000 +vt 1.000000 0.187500 +vt 0.968750 0.187500 +vt 0.937500 0.437500 +vt 0.906250 0.500000 +vt 0.937500 0.500000 +vt 0.937500 0.500000 +vt 0.968750 0.437500 +vt 0.937500 0.437500 +vt 0.937500 0.187500 +vt 0.937500 0.250000 +vt 0.937500 0.500000 +vt 0.968750 0.437500 +vt 0.937500 0.437500 +vt 0.937500 0.437500 +vt 0.906250 0.500000 +vt 0.937500 0.500000 +vt 0.937500 0.500000 +vt 0.968750 0.437500 +vt 0.937500 0.437500 +vt 0.937500 0.437500 +vt 0.906250 0.500000 +vt 0.937500 0.500000 +vt 0.937500 0.250000 +vt 0.875000 0.437500 +vt 0.906250 0.250000 +vt 0.906250 0.187500 +vt 1.000000 0.437500 +vt 1.000000 0.250000 +vt 0.968750 0.500000 +vt 0.968750 0.500000 +vt 0.968750 0.500000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 14/1/1 11/2/1 12/3/1 +f 16/4/1 11/5/1 13/6/1 +f 18/7/1 14/8/1 12/9/1 +f 14/1/1 19/10/1 13/11/1 +f 5/12/2 16/13/2 6/14/2 +f 4/15/2 19/16/2 10/17/2 +f 7/18/3 12/19/3 1/20/3 +f 6/21/4 13/22/4 4/23/4 +f 9/24/5 14/1/5 3/25/5 +f 3/26/4 17/27/4 8/28/4 +f 2/29/3 15/30/3 5/31/3 +f 10/32/4 20/33/4 9/34/4 +f 1/35/3 11/36/3 2/37/3 +f 8/38/5 18/7/5 7/18/5 +f 14/1/1 13/11/1 11/2/1 +f 16/4/1 15/39/1 11/5/1 +f 18/7/1 17/40/1 14/8/1 +f 14/1/1 20/41/1 19/10/1 +f 5/12/2 15/42/2 16/13/2 +f 4/15/2 13/43/2 19/16/2 +f 7/18/3 18/7/3 12/19/3 +f 6/21/4 16/44/4 13/22/4 +f 9/24/5 20/41/5 14/1/5 +f 3/26/4 14/45/4 17/27/4 +f 2/29/3 11/5/3 15/30/3 +f 10/32/4 19/46/4 20/33/4 +f 1/35/3 12/3/3 11/36/3 +f 8/38/5 17/40/5 18/7/5 +o Body +v -0.250000 0.750000 0.250000 +v -0.250000 1.250000 0.250000 +v -0.250000 0.750000 -0.250000 +v -0.250000 1.250000 -0.250000 +v 0.250000 0.750000 0.250000 +v 0.250000 1.250000 0.250000 +v 0.250000 0.750000 -0.250000 +v 0.250000 1.250000 -0.250000 +v -0.250000 0.750000 0.500000 +v -0.250000 1.250000 0.500000 +v 0.250000 0.750000 0.500000 +v 0.250000 1.250000 0.500000 +v -0.250000 1.250000 -0.500000 +v -0.250000 0.750000 -0.500000 +v 0.250000 0.750000 -0.500000 +v 0.250000 1.250000 -0.500000 +v -0.250000 1.000000 -0.500000 +v 0.250000 1.000000 -0.500000 +vt 0.375000 1.000000 +vt 0.500000 0.750000 +vt 0.375000 0.750000 +vt 0.062500 0.750000 +vt 0.125000 0.750000 +vt 0.125000 0.875000 +vt 0.500000 1.000000 +vt 0.375000 0.750000 +vt 0.500000 0.750000 +vt 0.250000 0.125000 +vt 0.312500 0.375000 +vt 0.250000 0.375000 +vt 1.000000 0.750000 +vt 0.875000 1.000000 +vt 0.875000 0.750000 +vt 0.625000 0.125000 +vt 0.500000 0.375000 +vt 0.500000 0.125000 +vt 0.437500 0.500000 +vt 0.562500 0.375000 +vt 0.562500 0.500000 +vt 0.312500 0.500000 +vt 0.437500 0.375000 +vt 0.437500 0.500000 +vt 0.437500 0.125000 +vt 0.500000 0.125000 +vt 0.312500 0.125000 +vt 0.687500 0.500000 +vt 0.562500 0.375000 +vt 0.687500 0.375000 +vt 0.687500 0.375000 +vt 0.562500 0.500000 +vt 0.562500 0.375000 +vt 0.625000 -0.000000 +vt 0.062500 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.875000 +vt 0.687500 0.500000 +vt 0.562500 0.375000 +vt 0.687500 0.375000 +vt 0.500000 1.000000 +vt 0.125000 1.000000 +vt 0.062500 1.000000 +vt 0.375000 1.000000 +vt 1.000000 1.000000 +vt 0.625000 0.375000 +vt 0.437500 0.375000 +vt 0.562500 0.500000 +vt 0.687500 0.500000 +vt 0.500000 -0.000000 +vt 0.125000 0.750000 +vt 0.062500 0.750000 +vt 0.562500 0.500000 +vn -1.0000 0.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +s off +f 22/47/6 23/48/6 21/49/6 +f 27/50/7 35/51/7 38/52/7 +f 28/53/7 25/54/7 27/55/7 +f 21/56/6 30/57/6 22/58/6 +f 27/59/8 21/60/8 23/61/8 +f 24/62/9 26/63/9 28/64/9 +f 25/65/8 29/66/8 21/67/8 +f 22/68/9 32/69/9 26/70/9 +f 26/63/7 31/71/7 25/72/7 +f 31/71/10 30/57/10 29/73/10 +f 33/74/11 38/75/11 37/76/11 +f 23/77/8 35/78/8 27/79/8 +f 28/64/9 33/80/9 24/62/9 +f 24/81/6 33/82/6 37/83/6 +f 37/84/11 35/85/11 34/86/11 +f 22/47/6 24/87/6 23/48/6 +f 36/88/7 28/89/7 38/52/7 +f 28/89/7 27/50/7 38/52/7 +f 28/53/7 26/90/7 25/54/7 +f 21/56/6 29/73/6 30/57/6 +f 27/59/8 25/91/8 21/60/8 +f 24/62/9 22/92/9 26/63/9 +f 25/65/8 31/93/8 29/66/8 +f 22/68/9 30/57/9 32/69/9 +f 26/63/7 32/69/7 31/71/7 +f 31/71/10 32/69/10 30/57/10 +f 33/74/11 36/94/11 38/75/11 +f 23/77/8 34/95/8 35/78/8 +f 28/64/9 36/96/9 33/80/9 +f 34/97/6 23/98/6 37/83/6 +f 23/98/6 24/81/6 37/83/6 +f 37/84/11 38/99/11 35/85/11 +o RightBackLeg +v -0.250000 0.000000 -0.125000 +v -0.250000 0.750000 -0.125000 +v -0.250000 0.000000 -0.375000 +v -0.250000 0.750000 -0.375000 +v 0.000000 0.000000 -0.125000 +v 0.000000 0.750000 -0.125000 +v 0.000000 0.000000 -0.375000 +v 0.000000 0.750000 -0.375000 +vt 0.687500 0.375000 +vt 0.625000 0.000000 +vt 0.687500 0.000000 +vt 0.875000 0.375000 +vt 0.812500 -0.000000 +vt 0.875000 -0.000000 +vt 0.812500 0.375000 +vt 0.750000 0.000000 +vt 0.750000 0.375000 +vt 0.750000 0.500000 +vt 0.812500 0.375000 +vt 0.812500 0.500000 +vt 0.687500 0.500000 +vt 0.750000 0.500000 +vt 0.625000 0.375000 +vt 0.750000 0.375000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +s off +f 40/100/12 41/101/12 39/102/12 +f 42/103/13 45/104/13 41/105/13 +f 46/106/14 43/107/14 45/104/14 +f 44/108/15 39/102/15 43/107/15 +f 45/109/16 39/110/16 41/111/16 +f 42/112/17 44/108/17 46/113/17 +f 40/100/12 42/114/12 41/101/12 +f 42/103/13 46/106/13 45/104/13 +f 46/106/14 44/108/14 43/107/14 +f 44/108/15 40/100/15 39/102/15 +f 45/109/16 43/115/16 39/110/16 +f 42/112/17 40/100/17 44/108/17 +o LeftBackLeg +v 0.000000 0.000000 -0.125000 +v 0.000000 0.750000 -0.125000 +v 0.000000 0.000000 -0.375000 +v 0.000000 0.750000 -0.375000 +v 0.250000 0.000000 -0.125000 +v 0.250000 0.750000 -0.125000 +v 0.250000 0.000000 -0.375000 +v 0.250000 0.750000 -0.375000 +vt 0.687500 0.375000 +vt 0.625000 0.000000 +vt 0.687500 0.000000 +vt 0.875000 0.375000 +vt 0.812500 -0.000000 +vt 0.875000 -0.000000 +vt 0.812500 0.375000 +vt 0.750000 0.000000 +vt 0.750000 0.375000 +vt 0.750000 0.500000 +vt 0.812500 0.375000 +vt 0.812500 0.500000 +vt 0.687500 0.500000 +vt 0.750000 0.500000 +vt 0.625000 0.375000 +vt 0.750000 0.375000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +s off +f 48/116/18 49/117/18 47/118/18 +f 50/119/19 53/120/19 49/121/19 +f 54/122/20 51/123/20 53/120/20 +f 52/124/21 47/118/21 51/123/21 +f 53/125/22 47/126/22 49/127/22 +f 50/128/23 52/124/23 54/129/23 +f 48/116/18 50/130/18 49/117/18 +f 50/119/19 54/122/19 53/120/19 +f 54/122/20 52/124/20 51/123/20 +f 52/124/21 48/116/21 47/118/21 +f 53/125/22 51/131/22 47/126/22 +f 50/128/23 48/116/23 52/124/23 +o RightFrontLeg +v -0.250000 0.000000 0.437500 +v -0.250000 0.750000 0.437500 +v -0.250000 0.000000 0.187500 +v -0.250000 0.750000 0.187500 +v 0.000000 0.000000 0.437500 +v 0.000000 0.750000 0.437500 +v 0.000000 0.000000 0.187500 +v 0.000000 0.750000 0.187500 +vt 0.062500 0.375000 +vt 0.000000 -0.000000 +vt 0.062500 -0.000000 +vt 0.250000 0.375000 +vt 0.187500 -0.000000 +vt 0.250000 -0.000000 +vt 0.187500 0.375000 +vt 0.125000 -0.000000 +vt 0.125000 0.375000 +vt 0.125000 0.500000 +vt 0.187500 0.375000 +vt 0.187500 0.500000 +vt 0.062500 0.500000 +vt 0.125000 0.500000 +vt 0.000000 0.375000 +vt 0.125000 0.375000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +s off +f 56/132/24 57/133/24 55/134/24 +f 58/135/25 61/136/25 57/137/25 +f 62/138/26 59/139/26 61/136/26 +f 60/140/27 55/134/27 59/139/27 +f 61/141/28 55/142/28 57/143/28 +f 58/144/29 60/140/29 62/145/29 +f 56/132/24 58/146/24 57/133/24 +f 58/135/25 62/138/25 61/136/25 +f 62/138/26 60/140/26 59/139/26 +f 60/140/27 56/132/27 55/134/27 +f 61/141/28 59/147/28 55/142/28 +f 58/144/29 56/132/29 60/140/29 +o LeftFrontLeg +v 0.000000 0.000000 0.437500 +v 0.000000 0.750000 0.437500 +v 0.000000 0.000000 0.187500 +v 0.000000 0.750000 0.187500 +v 0.250000 0.000000 0.437500 +v 0.250000 0.750000 0.437500 +v 0.250000 0.000000 0.187500 +v 0.250000 0.750000 0.187500 +vt 0.062500 0.375000 +vt 0.000000 -0.000000 +vt 0.062500 -0.000000 +vt 0.250000 0.375000 +vt 0.187500 -0.000000 +vt 0.250000 -0.000000 +vt 0.187500 0.375000 +vt 0.125000 -0.000000 +vt 0.125000 0.375000 +vt 0.125000 0.500000 +vt 0.187500 0.375000 +vt 0.187500 0.500000 +vt 0.062500 0.500000 +vt 0.125000 0.500000 +vt 0.000000 0.375000 +vt 0.125000 0.375000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +s off +f 64/148/30 65/149/30 63/150/30 +f 66/151/31 69/152/31 65/153/31 +f 70/154/32 67/155/32 69/152/32 +f 68/156/33 63/150/33 67/155/33 +f 69/157/34 63/158/34 65/159/34 +f 66/160/35 68/156/35 70/161/35 +f 64/148/30 66/162/30 65/149/30 +f 66/151/31 70/154/31 69/152/31 +f 70/154/32 68/156/32 67/155/32 +f 68/156/33 64/148/33 63/150/33 +f 69/157/34 67/163/34 63/158/34 +f 66/160/35 64/148/35 68/156/35 +o Head +v -0.125000 1.131314 0.489277 +v -0.125000 1.372795 0.553981 +v -0.125000 1.196019 0.247795 +v -0.125000 1.437500 0.312500 +v 0.125000 1.131314 0.489277 +v 0.125000 1.372795 0.553981 +v 0.125000 1.196019 0.247795 +v 0.125000 1.437500 0.312500 +v 0.125000 1.812500 0.437500 +v 0.125000 1.812500 0.312500 +v 0.250000 1.812500 0.437500 +v 0.250000 1.812500 0.312500 +v 0.125000 1.937500 0.437500 +v 0.125000 1.937500 0.312500 +v 0.250000 1.937500 0.312500 +v 0.250000 1.937500 0.437500 +v -0.250000 1.812500 0.437500 +v -0.250000 1.812500 0.312500 +v -0.125000 1.812500 0.437500 +v -0.125000 1.812500 0.312500 +v -0.250000 1.937500 0.437500 +v -0.250000 1.937500 0.312500 +v -0.125000 1.937500 0.312500 +v -0.125000 1.937500 0.437500 +v -0.250000 1.312500 0.750000 +v -0.250000 1.812500 0.750000 +v -0.250000 1.312500 0.250000 +v -0.250000 1.812500 0.250000 +v 0.250000 1.312500 0.750000 +v 0.250000 1.812500 0.750000 +v 0.250000 1.312500 0.250000 +v 0.250000 1.812500 0.250000 +vt 0.062500 0.500000 +vt 0.000000 0.375000 +vt 0.062500 0.375000 +vt 0.062500 0.500000 +vt 0.000000 0.375000 +vt 0.062500 0.375000 +vt 0.062500 0.500000 +vt 0.000000 0.375000 +vt 0.062500 0.375000 +vt 0.062500 0.500000 +vt -0.000000 0.375000 +vt 0.062500 0.375000 +vt 0.218750 0.500000 +vt 0.250000 0.437500 +vt 0.250000 0.500000 +vt 0.218750 0.500000 +vt 0.250000 0.437500 +vt 0.250000 0.500000 +vt 0.218750 0.375000 +vt 0.187500 0.437500 +vt 0.187500 0.375000 +vt 0.250000 0.375000 +vt 0.218750 0.437500 +vt 0.312500 0.375000 +vt 0.281250 0.437500 +vt 0.281250 0.375000 +vt 0.218750 0.375000 +vt 0.187500 0.437500 +vt 0.187500 0.375000 +vt 0.250000 0.375000 +vt 0.218750 0.437500 +vt 0.312500 0.375000 +vt 0.281250 0.437500 +vt 0.281250 0.375000 +vt 0.125000 0.750000 +vt -0.000000 0.500000 +vt 0.125000 0.500000 +vt 0.500000 0.750000 +vt 0.375000 0.500000 +vt 0.500000 0.500000 +vt 0.375000 0.750000 +vt 0.250000 0.500000 +vt 0.250000 0.750000 +vt 0.250000 1.000000 +vt 0.375000 0.750000 +vt 0.375000 1.000000 +vt 0.125000 1.000000 +vt 0.250000 1.000000 +vt 0.000000 0.500000 +vt 0.000000 0.500000 +vt 0.000000 0.500000 +vt -0.000000 0.500000 +vt 0.312500 0.437500 +vt 0.312500 0.437500 +vt -0.000000 0.750000 +vt 0.250000 0.750000 +vn -1.0000 -0.0000 0.0000 +vn 0.0000 0.2588 -0.9659 +vn 1.0000 0.0000 0.0000 +vn 0.0000 -0.2588 0.9659 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 72/164/36 73/165/36 71/166/36 +f 74/167/37 77/168/37 73/169/37 +f 78/170/38 75/171/38 77/172/38 +f 76/173/39 71/174/39 75/175/39 +f 92/176/40 94/177/40 93/178/40 +f 84/179/40 86/180/40 85/181/40 +f 79/182/36 84/183/36 80/184/36 +f 81/185/41 83/186/41 79/182/41 +f 80/187/42 85/188/42 82/189/42 +f 82/189/38 86/180/38 81/185/38 +f 87/190/36 92/191/36 88/192/36 +f 89/193/41 91/194/41 87/190/41 +f 88/195/42 93/196/42 90/197/42 +f 90/197/38 94/177/38 89/193/38 +f 96/198/36 97/199/36 95/200/36 +f 98/201/42 101/202/42 97/203/42 +f 102/204/38 99/205/38 101/202/38 +f 100/206/41 95/200/41 99/205/41 +f 101/207/43 95/208/43 97/209/43 +f 98/210/40 100/206/40 102/211/40 +f 72/164/36 74/212/36 73/165/36 +f 74/167/37 78/213/37 77/168/37 +f 78/170/38 76/214/38 75/171/38 +f 76/173/39 72/215/39 71/174/39 +f 92/176/40 91/194/40 94/177/40 +f 84/179/40 83/186/40 86/180/40 +f 79/182/36 83/186/36 84/183/36 +f 81/185/41 86/180/41 83/186/41 +f 80/187/42 84/216/42 85/188/42 +f 82/189/38 85/188/38 86/180/38 +f 87/190/36 91/194/36 92/191/36 +f 89/193/41 94/177/41 91/194/41 +f 88/195/42 92/217/42 93/196/42 +f 90/197/38 93/196/38 94/177/38 +f 96/198/36 98/218/36 97/199/36 +f 98/201/42 102/204/42 101/202/42 +f 102/204/38 100/206/38 99/205/38 +f 100/206/41 96/198/41 95/200/41 +f 101/207/43 99/219/43 95/208/43 +f 98/210/40 96/198/40 100/206/40 +o Tail +v -0.125000 1.375000 -0.625000 +v -0.125000 0.375000 -0.625000 +v 0.125000 0.375000 -0.625000 +v 0.125000 1.375000 -0.625000 +v -0.125000 1.375000 -0.875000 +v -0.125000 0.375000 -0.875000 +v 0.125000 0.375000 -0.875000 +v 0.125000 1.375000 -0.875000 +v -0.062500 1.079247 -0.437500 +v 0.062500 1.079247 -0.437500 +v -0.062500 1.187500 -0.375000 +v 0.062500 1.187500 -0.375000 +v -0.062500 1.266747 -0.762259 +v 0.062500 1.266747 -0.762259 +v -0.062500 1.375000 -0.699759 +v 0.062500 1.375000 -0.699759 +v -0.125000 0.875000 -0.625000 +v 0.125000 0.875000 -0.625000 +v -0.125000 0.875000 -0.875000 +v 0.125000 0.875000 -0.875000 +vt 0.562500 0.750000 +vt 0.500000 1.000000 +vt 0.500000 0.750000 +vt 0.562500 1.000000 +vt 0.500000 0.750000 +vt 0.562500 0.750000 +vt 0.562500 0.875000 +vt 0.500000 1.000000 +vt 0.500000 0.875000 +vt 0.561728 0.810686 +vt 0.499228 0.935686 +vt 0.499228 0.810686 +vt 0.625000 1.000000 +vt 0.625000 0.750000 +vt 0.562500 0.750000 +vt 0.625000 1.000000 +vt 0.562500 1.000000 +vt 0.500000 0.937500 +vt 0.593750 1.000000 +vt 0.593750 0.937500 +vt 0.531250 0.812500 +vt 0.500000 1.000000 +vt 0.500000 0.812500 +vt 0.500000 0.937500 +vt 0.593750 1.000000 +vt 0.500000 1.000000 +vt 0.531250 0.812500 +vt 0.500000 1.000000 +vt 0.500000 0.812500 +vt 0.625000 1.000000 +vt 0.562500 1.000000 +vt 0.625000 1.000000 +vt 0.562500 0.750000 +vt 0.625000 0.750000 +vt 0.562500 1.000000 +vt 0.500000 0.750000 +vt 0.500000 1.000000 +vt 0.500000 0.750000 +vt 0.500000 1.000000 +vt 0.562500 1.000000 +vt 0.561728 0.935686 +vt 0.625000 0.750000 +vt 0.500000 1.000000 +vt 0.531250 1.000000 +vt 0.593750 0.937500 +vt 0.531250 1.000000 +vt 0.625000 0.750000 +vt 0.500000 1.000000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.8660 0.5000 +vn 0.0000 -0.8660 -0.5000 +s off +f 120/220/44 103/221/44 119/222/44 +f 107/223/45 122/224/45 121/225/45 +f 104/226/46 109/227/46 105/228/46 +f 106/229/47 107/230/47 103/231/47 +f 103/232/48 121/225/48 119/233/48 +f 105/234/49 122/235/49 120/236/49 +f 111/237/48 117/238/48 115/239/48 +f 114/240/50 117/241/50 113/242/50 +f 112/243/49 118/244/49 114/245/49 +f 111/246/51 116/247/51 112/248/51 +f 120/220/49 110/249/49 106/250/49 +f 119/251/48 108/252/48 104/253/48 +f 121/254/45 109/255/45 108/252/45 +f 105/234/44 119/256/44 104/257/44 +f 120/220/44 106/250/44 103/221/44 +f 107/223/45 110/258/45 122/224/45 +f 104/226/46 108/259/46 109/227/46 +f 106/229/47 110/260/47 107/230/47 +f 103/232/48 107/223/48 121/225/48 +f 105/234/49 109/261/49 122/235/49 +f 111/237/48 113/262/48 117/238/48 +f 114/240/50 118/263/50 117/241/50 +f 112/243/49 116/264/49 118/244/49 +f 111/246/51 115/265/51 116/247/51 +f 120/220/49 122/266/49 110/249/49 +f 119/251/48 121/254/48 108/252/48 +f 121/254/45 122/267/45 109/255/45 +f 105/234/44 120/236/44 119/256/44 +o RightWing +v -0.250000 0.937500 0.250000 +v -0.250000 1.062500 0.250000 +v -0.250000 0.937500 -0.125000 +v -0.250000 1.062500 -0.125000 +v -0.250000 1.187500 0.250000 +v -0.250000 1.187500 -0.125000 +v -0.250000 0.812500 0.250000 +v -0.250000 0.812500 -0.125000 +v -0.250000 0.937500 -0.250000 +v -0.250000 1.062500 -0.250000 +v -0.375000 1.062500 0.250000 +v -0.375000 0.937500 0.250000 +v -0.375000 1.062500 -0.125000 +v -0.375000 0.937500 -0.125000 +v -0.375000 1.187500 0.250000 +v -0.375000 1.187500 -0.125000 +v -0.375000 0.812500 -0.125000 +v -0.375000 0.812500 0.250000 +v -0.375000 1.062500 -0.250000 +v -0.375000 0.937500 -0.250000 +vt 0.875000 0.437500 +vt 0.906250 0.250000 +vt 0.906250 0.437500 +vt 0.906250 0.437500 +vt 0.875000 0.250000 +vt 0.906250 0.250000 +vt 0.875000 0.250000 +vt 0.906250 0.437500 +vt 0.875000 0.437500 +vt 0.875000 0.187500 +vt 0.875000 0.250000 +vt 1.000000 0.250000 +vt 0.968750 0.437500 +vt 0.968750 0.250000 +vt 1.000000 0.187500 +vt 0.968750 0.250000 +vt 0.968750 0.187500 +vt 0.906250 0.500000 +vt 0.937500 0.437500 +vt 0.937500 0.500000 +vt 0.968750 0.437500 +vt 0.937500 0.500000 +vt 0.937500 0.437500 +vt 0.937500 0.187500 +vt 0.937500 0.250000 +vt 0.968750 0.437500 +vt 0.937500 0.500000 +vt 0.937500 0.437500 +vt 0.906250 0.500000 +vt 0.937500 0.437500 +vt 0.937500 0.500000 +vt 0.968750 0.437500 +vt 0.937500 0.500000 +vt 0.937500 0.437500 +vt 0.906250 0.500000 +vt 0.937500 0.437500 +vt 0.937500 0.500000 +vt 0.937500 0.250000 +vt 0.875000 0.437500 +vt 0.906250 0.250000 +vt 0.906250 0.187500 +vt 1.000000 0.437500 +vt 1.000000 0.250000 +vt 0.968750 0.500000 +vt 0.968750 0.500000 +vt 0.968750 0.500000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 -1.0000 0.0000 +s off +f 133/268/52 136/269/52 134/270/52 +f 133/271/52 138/272/52 135/273/52 +f 136/274/52 140/275/52 134/276/52 +f 141/277/52 136/269/52 135/278/52 +f 138/279/53 127/280/53 128/281/53 +f 141/282/53 126/283/53 132/284/53 +f 134/285/54 129/286/54 123/287/54 +f 135/288/55 128/289/55 126/290/55 +f 136/269/56 131/291/56 125/292/56 +f 139/293/55 125/294/55 130/295/55 +f 137/296/54 124/297/54 127/298/54 +f 142/299/55 132/300/55 131/301/55 +f 133/302/54 123/303/54 124/304/54 +f 140/275/56 130/305/56 129/286/56 +f 133/268/52 135/278/52 136/269/52 +f 133/271/52 137/306/52 138/272/52 +f 136/274/52 139/307/52 140/275/52 +f 141/277/52 142/308/52 136/269/52 +f 138/279/53 137/309/53 127/280/53 +f 141/282/53 135/310/53 126/283/53 +f 134/285/54 140/275/54 129/286/54 +f 135/288/55 138/311/55 128/289/55 +f 136/269/56 142/308/56 131/291/56 +f 139/293/55 136/312/55 125/294/55 +f 137/296/54 133/271/54 124/297/54 +f 142/299/55 141/313/55 132/300/55 +f 133/302/54 134/270/54 123/303/54 +f 140/275/56 139/307/56 130/305/56 +o HornPointy +v -0.031250 1.765625 0.745813 +v 0.031250 1.765625 0.745813 +v -0.031250 1.796875 0.691687 +v 0.031250 1.796875 0.691687 +v 0.000000 1.997756 0.843750 +vt 0.062500 0.750000 +vt 0.046875 0.875000 +vt 0.046875 0.750000 +vt 0.015625 0.750000 +vt 0.000000 0.875000 +vt 0.000000 0.750000 +vt 0.031250 0.875000 +vt 0.031250 0.750000 +vt 0.015625 0.875000 +vn 0.0000 0.6036 -0.7973 +vn -0.9923 0.1074 0.0620 +vn 0.9923 0.1074 0.0620 +vn 0.0000 -0.3887 0.9214 +s off +f 145/314/57 147/315/57 146/316/57 +f 143/317/58 147/318/58 145/319/58 +f 146/316/59 147/320/59 144/321/59 +f 143/317/60 144/321/60 147/322/60 +o Horn +v -0.031250 1.765625 0.745813 +v 0.031250 1.765625 0.745813 +v -0.031250 1.796875 0.691687 +v 0.031250 1.796875 0.691687 +v -0.031250 1.982131 0.870813 +v 0.031250 1.982131 0.870813 +v -0.031250 2.013381 0.816687 +v 0.031250 2.013381 0.816687 +vt 0.046875 0.875000 +vt 0.031250 0.750000 +vt 0.046875 0.750000 +vt 0.015625 0.750000 +vt -0.000000 0.875000 +vt -0.000000 0.750000 +vt 0.062500 0.875000 +vt 0.062500 0.750000 +vt 0.031250 0.875000 +vt 0.015625 0.875000 +vt 0.031250 0.906250 +vt 0.015625 0.906250 +vn 1.0000 0.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.5000 -0.8660 +vn 0.0000 -0.5000 0.8660 +vn 0.0000 0.8660 0.5000 +s off +f 155/323/61 149/324/61 151/325/61 +f 148/326/62 154/327/62 150/328/62 +f 154/329/63 151/325/63 150/330/63 +f 153/331/64 148/326/64 149/324/64 +f 152/332/65 155/333/65 154/334/65 +f 155/323/61 153/331/61 149/324/61 +f 148/326/62 152/332/62 154/327/62 +f 154/329/63 155/323/63 151/325/63 +f 153/331/64 152/332/64 148/326/64 +f 152/332/65 153/331/65 155/333/65 +o NoseMale +v -0.125000 1.312500 0.750000 +v 0.125000 1.312500 0.750000 +v -0.125000 1.312500 0.812500 +v 0.125000 1.312500 0.812500 +v -0.125000 1.500000 0.750000 +v 0.125000 1.500000 0.750000 +v -0.125000 1.500000 0.812500 +v 0.125000 1.500000 0.812500 +vt 0.281250 0.781250 +vt 0.343750 0.750000 +vt 0.343750 0.781250 +vt 0.156250 0.562500 +vt 0.218750 0.593750 +vt 0.156250 0.593750 +vt 0.171875 0.500000 +vt 0.156250 0.500000 +vt 0.281250 0.781250 +vt 0.218750 0.500000 +vt 0.203125 0.593750 +vt 0.203125 0.500000 +vt 0.218750 0.500000 +vt 0.156250 0.593750 +vt 0.156250 0.500000 +vt 0.281250 0.750000 +vt 0.218750 0.562500 +vt 0.171875 0.593750 +vt 0.343750 0.781250 +vt 0.218750 0.593750 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +s off +f 157/335/66 158/336/66 156/337/66 +f 162/338/67 161/339/67 160/340/67 +f 158/341/68 160/340/68 156/342/68 +f 156/337/69 161/343/69 157/335/69 +f 157/344/70 163/345/70 159/346/70 +f 159/347/71 162/348/71 158/349/71 +f 157/335/66 159/350/66 158/336/66 +f 162/338/67 163/351/67 161/339/67 +f 158/341/68 162/352/68 160/340/68 +f 156/337/69 160/353/69 161/343/69 +f 157/344/70 161/339/70 163/345/70 +f 159/347/71 163/354/71 162/348/71 +o NoseFemale +v -0.125000 1.312500 0.750000 +v 0.125000 1.312500 0.750000 +v -0.125000 1.437500 0.750000 +v 0.125000 1.437500 0.750000 +v -0.062500 1.437500 0.750000 +v 0.062500 1.437500 0.750000 +v -0.062500 1.500000 0.750000 +v 0.062500 1.500000 0.750000 +v -0.125000 1.312500 0.812500 +v 0.125000 1.312500 0.812500 +v -0.125000 1.437500 0.812500 +v 0.125000 1.437500 0.812500 +v -0.062500 1.437500 0.812500 +v 0.062500 1.437500 0.812500 +v -0.062500 1.500000 0.812500 +v 0.062500 1.500000 0.812500 +vt 0.171875 0.593750 +vt 0.203125 0.625000 +vt 0.171875 0.625000 +vt 0.171875 0.593750 +vt 0.187500 0.625000 +vt 0.140625 0.500000 +vt 0.156250 0.562500 +vt 0.140625 0.562500 +vt 0.156250 0.531250 +vt 0.156250 0.562500 +vt 0.187500 0.593750 +vt 0.203125 0.593750 +vt 0.218750 0.562500 +vt 0.234375 0.531250 +vt 0.234375 0.562500 +vt 0.218750 0.500000 +vt 0.234375 0.500000 +vt 0.281250 0.781250 +vt 0.343750 0.750000 +vt 0.343750 0.781250 +vt 0.203125 0.562500 +vt 0.171875 0.562500 +vt 0.156250 0.500000 +vt 0.203125 0.593750 +vt 0.187500 0.593750 +vt 0.140625 0.531250 +vt 0.187500 0.625000 +vt 0.218750 0.531250 +vt 0.218750 0.562500 +vt 0.281250 0.750000 +vn 0.0000 1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 0.0000 1.0000 +s off +f 178/355/72 171/356/72 170/357/72 +f 168/358/73 178/359/73 170/357/73 +f 164/360/73 174/361/73 166/362/73 +f 166/362/72 176/363/72 168/364/72 +f 171/356/74 177/365/74 169/366/74 +f 169/367/72 175/368/72 167/369/72 +f 167/369/74 173/370/74 165/371/74 +f 165/372/75 172/373/75 164/374/75 +f 177/375/76 176/376/76 172/377/76 +f 178/355/72 179/378/72 171/356/72 +f 168/358/73 176/379/73 178/359/73 +f 164/360/73 172/377/73 174/361/73 +f 166/362/72 174/380/72 176/363/72 +f 171/356/74 179/381/74 177/365/74 +f 169/367/72 177/382/72 175/368/72 +f 167/369/74 175/383/74 173/370/74 +f 165/372/75 173/384/75 172/373/75 +f 172/377/76 173/370/76 177/375/76 +f 173/370/76 175/383/76 177/375/76 +f 177/375/76 179/378/76 178/355/76 +f 176/376/76 174/361/76 172/377/76 +f 177/375/76 178/355/76 176/376/76 +o Mane +v -0.281250 1.281250 0.781250 +v -0.281250 1.843750 0.781250 +v -0.281250 1.281250 0.218750 +v -0.281250 1.843750 0.218750 +v 0.281250 1.281250 0.781250 +v 0.281250 1.843750 0.781250 +v 0.281250 1.281250 0.218750 +v 0.281250 1.843750 0.218750 +vt 0.625000 0.750000 +vt 0.500000 0.500000 +vt 0.625000 0.500000 +vt 1.000000 0.750000 +vt 0.875000 0.500000 +vt 1.000000 0.500000 +vt 0.875000 0.750000 +vt 0.750000 0.500000 +vt 0.750000 0.750000 +vt 0.750000 1.000000 +vt 0.875000 0.750000 +vt 0.875000 1.000000 +vt 0.625000 1.000000 +vt 0.750000 1.000000 +vt 0.500000 0.750000 +vt 0.750000 0.750000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +s off +f 181/385/77 182/386/77 180/387/77 +f 183/388/78 186/389/78 182/390/78 +f 187/391/79 184/392/79 186/389/79 +f 185/393/80 180/387/80 184/392/80 +f 186/394/81 180/395/81 182/396/81 +f 183/397/82 185/393/82 187/398/82 +f 181/385/77 183/399/77 182/386/77 +f 183/388/78 187/391/78 186/389/78 +f 187/391/79 185/393/79 184/392/79 +f 185/393/80 181/385/80 180/387/80 +f 186/394/81 184/400/81 180/395/81 +f 183/397/82 181/385/82 185/393/82 diff --git a/src/main/resources/assets/hbm/textures/models/horse/_horse_info.txt b/src/main/resources/assets/hbm/textures/models/horse/_horse_info.txt new file mode 100644 index 000000000..5303e3ca4 --- /dev/null +++ b/src/main/resources/assets/hbm/textures/models/horse/_horse_info.txt @@ -0,0 +1,38 @@ +horse model is a reverse-engineered mesh based on the models from MineLittlePony 1.2 (at least based on MCSkin3D's packed template models), the UV mostly matches the default unwrap of a ModelRenderer model, which means that MiLP skins should be compatible with the new horse model. UV is a bit weird in some places (mostly the tail and the torso) but that weirdness has been kept to ensure compatibility. + +in addition, a few liberties have been taken: +* angles are approximate, being "good enough" +* an alternate horn model has been added that uses tris, making it pointy (still four faces) +* due to major weirdness in both the extended wing models and UV (i could not find animation data or how the wings would be positioned, so they aren't included), will find solution later (maybe resue the murky wing model?) + +despite the UV being generally crappy, the added overlap does simplify the texturing process quite a bit (especially on the nose, which reuses individual pixels from the face). textures will be kept simple anyway, so any disadvantages of this simplified "crammed" UV won't be noticable anyway. + +no further improvements have been deemend necessary. a few edge-cases where body parts would be otherwise invisible could be handled by making the texture transparent. horn sizes can be solved by moving the horn inwards (this only works for shrinking, limiting the max size to the current 4 pixels, unless proper scaling is involved which is a possibility). any other cosmetics or posing will be subject to the horse printing utlity (HPU) using basic GL transformation. + +in general, the standard approach for posable models has been taken: all major movable groups (mostly individual boxes, as well as a few larger groups like the wings, tail and head/neck/ears) are different objects (groups with prefix "o", as per the wavefront OBJ standard) as well as some switchable parts (horns, noses). most pixot points use the default multiple of 0.0625 positions to make posing easier and consistent. + +a short explanation of the horse template texture sheet: +* the yellow region "H" is the horn, of the top two pixels only the left one is used (by the box horn, on the top) while the right one is not visible in the original MiLP standard, nor unwrapped in the new model +* the large red region "H" represents the head in standard format +* the yellow 8x8 "BS" is the "body side", used in the center of both sides of the torso, appearing morrored o nthe right side +* the checkerboard patterns are used by the tail, with the pink checkerboard being used for front/back/top/bottom/bridge while the purple checkerboard is used by left/right. both 4x8 segments repeat twice for the 4x16 structure +* the large purple region "H" represents the hair in standard format +* the pink 8x8 "BB" is the "body bottom", analogous to "body side" but only used once at the bottom of the torso +* the yellow 4x4 "N" is the neck, where the same region is re-used for all sides. curiously, the back and right sides are mirrored +* the blue region "L" is for both front legs in standard format +* the pink region "E" is used for both ears. the top right face is not seen, as it touches on the top of the head +* the orange region "BF" is "body front", representing the entire front part of the torso following a cuboid of standard format without the back face +* the pink region "BT" is "body top", spanning from the 8x8 center to the 4x8 back +* the green 4x8 "LL" is a texture repeated thrice for the back of the torso, twice for the back 8x8 and once for the 4x8 at the bottom back +* the blue region "L" is for both back legs in standard format +* the next strip describes the wings, which are a bit more complex due to their segmented and repeating nature. the description applies to the right wing, the left one is mirrored: + * the first bottom 2x6 strip describes the side feathers, with a 2x2 extension for the second feather row + * the second 2x6 strip describes the bottom, with the 2x2 extension again applying to the second row + * the third strip is skipped due to being covered + * the fourth 2x6 strip describes the top, with the 2x2 extension once again being used for the second row + * the first top 2x2 is the front of every feather row + * the second top 2x2 is the back + +shoutouts to the dumbfucks who insisted on either looking through my commit history or just spelunking in the mod's asset folder, who are now probably wondering where the hell this model is even used. please mind your own damn business just for once. + +no, i haven't proof-read any of this and i'm not going to. diff --git a/src/main/resources/assets/hbm/textures/models/horse/horse_template.png b/src/main/resources/assets/hbm/textures/models/horse/horse_template.png index 520b0b9dd..f33c4fadd 100644 Binary files a/src/main/resources/assets/hbm/textures/models/horse/horse_template.png and b/src/main/resources/assets/hbm/textures/models/horse/horse_template.png differ